Remy Oukaour
24f0e7d045
Rename: emote_headers, sprite_headers, cry_headers, gfx_headers, tileset_headers
2017-12-26 12:50:32 -05:00
Remy Oukaour
17f45b5c95
MAX_LEVEL = 255 should still compile
2017-12-25 15:46:24 -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
c6b12b07b3
Group Pokérus files in engine/pokerus/
2017-12-24 20:11:03 -05:00
Remy Oukaour
aeee49d29b
Change a few Unknown labels
2017-12-24 20:07:23 -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
040aa7cb17
LoadEDTile → CopyTilemapAtOnce ( fix #345 )
2017-12-24 18:11:17 -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
Remy Oukaour
b805d343f3
Merge branch 'master' of https://github.com/pret/pokecrystal
2017-12-24 17:30:29 -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
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
cbec3771e2
Misc fixes for the usage of constants
...
Several improvements that will make it easier to edit some data
structures for everyone.
2017-12-24 14:42:13 +01:00
yenatch
c51968f0de
Merge remote-tracking branch 'origin/master' into master
2017-12-23 17:14:09 -05:00
Remy Oukaour
1d2df3bba1
Some more WRAM cleanup
2017-12-23 11:34:55 -05:00
Remy Oukaour
ff4d25eee3
Include bugfix in comments
2017-12-21 12:11:35 -05:00
Remy Oukaour
02609940db
Document one more bug
2017-12-21 11:43:41 -05:00
Remy Oukaour
2fa1e97aeb
Document two more bugs
2017-12-19 19:04:56 -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
bd6dc94da0
Move tileset-specific palette code into tilesets/
2017-12-16 00:52:16 -05:00
Remy Oukaour
fbf931f5d3
Ad some more constants for meaningful audio WRAM bits
2017-12-16 00:50:03 -05:00
Remy Oukaour
cbde91d7ed
Only engine/decorations.asm uses PadCoords_de
2017-12-15 23:59:24 -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
surskitty
c883ab4d34
Reorganising phone stuff.
2017-12-15 23:06:53 -05:00
Remy Oukaour
fa98c29fa4
Add more palettes to data/palettes/
2017-12-15 22:36:33 -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
surskitty
cb5aa29228
Labelling the remaining stuff one sed at a time.
2017-12-15 18:16:27 -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
ebf3bfb6b2
Move some misc/ files into meaningful directories
2017-12-15 12:53:33 -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
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
75c56e86c4
The labelling never ends, but phone_scripts.asm does.
2017-12-14 21:19:46 -05:00
surskitty
955a0c9dd3
Another batch.
2017-12-14 15:39:46 -05:00
surskitty
f905a2353e
One day we'll be through with this. Labels.
2017-12-14 15:25:46 -05:00
surskitty
62dd7a8bae
phone_scripts is most of the way there, too.
2017-12-14 14:48:39 -05:00
surskitty
e1413e022d
phone_callers.asm is now fully readable, if not fully labelled.
2017-12-14 14:13:10 -05:00
Remy Oukaour
e48a401290
Reorganize macros
2017-12-14 00:36:24 -05:00
surskitty
1116180e3c
Renaming RandomPhoneRareWildMon to RandomRareWildMon.
2017-12-13 23:39:47 -05:00
surskitty
8e54adc22f
Labels, including a comment explaining RandomPhoneRareWildMon.
2017-12-13 23:35:07 -05:00
surskitty
1f0fbfb602
Label label label.
2017-12-13 22:54:29 -05:00
surskitty
d69d81f3a0
Fix the spelling of Thursday
2017-12-13 22:41:15 -05:00
surskitty
a5c0461192
Labels labels labels
2017-12-13 22:40:11 -05:00
surskitty
771c4a7e05
Splitting phone scripts up.
2017-12-13 22:30:37 -05:00
surskitty
8fa7183d29
More phone script labelling.
2017-12-13 21:50:32 -05:00
surskitty
2b72d949b2
Another batch of labels. Jack's move trivia, mostly.
2017-12-13 21:12:42 -05:00
surskitty
cb1c6967ed
Some more phone labels.
2017-12-13 20:49:10 -05:00
surskitty
4b36a9d2e1
Merge branch 'master' of github.com:pret/pokecrystal
2017-12-13 19:55:03 -05:00
surskitty
e3ee39f334
Labelling the bragging phone calls.
2017-12-13 19:54:28 -05:00
Remy Oukaour
76ea57688e
Add table of contents (might remove if it's too cumbersome to maintain)
2017-12-13 00:28:48 -05:00
yenatch
725750d69d
use an xor instead of the result
2017-12-12 23:45:32 -05:00
Remy Oukaour
10eb426e40
Document more bugs
2017-12-12 22:58:20 -05:00
Remy Oukaour
ad620243d9
Fix make compare
2017-12-12 20:21:08 -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
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
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
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
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
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
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
b4261d27d8
Use new palette constants
2017-12-10 20:50:08 -05:00
Remy Oukaour
699495bfcb
Consistent capitalization for map names, matching their constants
2017-12-10 13:37:15 -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 as and spaces after commas
2017-12-10 00:06:20 -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
59ee673775
Consistent pointer labels in WRAM
2017-12-09 22:24:43 -05:00
Remy Oukaour
cd2a748128
More WRAM cleanup
2017-12-09 22:00:36 -05:00
Remy Oukaour
880fb511e1
More WRAM organization
2017-12-09 15:28:03 -05:00
Remy Oukaour
e3c686f6df
Further WRAM organization
2017-12-09 15:14:51 -05:00
Remy Oukaour
5a5df2ab87
More WRAM organization
2017-12-09 14:47:32 -05:00
Remy Oukaour
16c6696dd5
Start organizing WRAM
...
- Use db and dw when they're more meaningful than ds 1/2
- Use unions to group related labels
2017-12-09 13:58:49 -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
a1fc73603e
Label all of PARTYMENUACTION_*
...
It's pretty clear what it's used for.
PartyMenuActionText is used for two things:
1) Storing what kind of action we're going to do (<$10)
2) Storing the text for some kind of healing stuff I'm not entirely sure (>=$f0)
In the former case, if GetPartyMenuTilemapPointers is ran, it will be
used to pick a sequence of actions that should be done, specified in the
table, and it'll print the corresponding string using the
PartyMenuStrings table. The items in the sequence of actions that should
be done are in WritePartyMenuTilemap.
Strangely enough, one possible value is left completely unused:
PARTYMENUACTION_GIVE_MON_FEMALE. It works in the exact same way as it's
male counterpart, and as such I don't believe it was used in the
japanese version either, since it doesn't matter which gender your 'mon
is when you put 'em in the daycare.
2017-11-30 20:35:58 +01:00
mid-kid
2cc2f057e8
Fix some SPRITE_ANIM_FRAMESET_ constants
...
Thanks to @roukaour for the fixes.
2017-11-29 20:24:19 +01:00
mid-kid
09d9f2c1ef
Add MobileError-related labels
...
This function is called from a few different places in the mobile code,
including from one special that is only executed when the
BattleTowerRoomMenu special returns with a non-zero code.
Since that special causes a blue "error" screen to appear, that looks
the exact same as the one you'd get when trying to connect from the
mobile trade corner/battle colosseum in a Pokémon Center's top floor,
and this function contains a bunch of japanese strings in a jumptable, I
think it's reasonable to assume it should be called
"DisplayMobileError".
2017-11-26 11:35:13 +01:00
mid-kid
afc92eadc1
Label BattleTowerRoomMenu
...
All of the functions called by it are prefixed with BattleTowerRoomMenu,
but a bunch of them seem more generic than that, since they're part of
different mobile menus. Also called another menu jumptable
BattleTowerRoomMenu2 for the lack of a better name (only the Yes/No menu
functions are used in western crystal).
The names of the more generic functions should be fixed when we start
labelling other menus.
2017-11-25 17:03:20 +01:00
Marcus Huderle
c28be02a19
Merge pull request #395 from surskitty/master
...
Some Script Labels
2017-11-21 17:18:29 -08:00
mid-kid
e21551db62
CeruleanCaveNane -> CeruleanCaveName
2017-11-16 18:19:33 +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
pfero
88f1b8165b
Define GetWarpSFX
...
This function checks the current tile at the player's feet, and returns
an appropriate SFX that should be played when warping from it.
2017-10-29 11:14:59 +01:00
pfero
7c9a156133
Fix WATERTILE/WALLTILE constants
...
WATRTILE was wrongly defined as 15, and WALLTILE as 1. Those had to be
flipped around.
This has allowed for us to replace inmediate values with these constants
in several places to improve readability.
WATRTILE was renamed to WATERTILE in the name of readability.
2017-10-28 18:08:24 -04:00
surskitty
6cdc14b920
Labelling a few mom scripts.
2017-10-25 00:34:32 -04:00
