Commit Graph

404 Commits

Author SHA1 Message Date
Rangi
c04b455aac Identify "branch" labels in battle animations 2020-01-05 15:42:21 -05:00
Rangi
94ebdab6d3
Merge pull request #660 from mid-kid/master
Make the map setup commands match the actual function names better
2020-01-04 20:08:43 -05:00
Rangi
ef48ae98b5 Separate tilesets.o goes with pics.o and sprites.o 2019-11-23 20:43:33 -05:00
mid-kid
739a60b33c Make the map setup commands match the actual function names better
These functions used as map setup commands are used in other places,
too, so I can't prefix them under the same. The names should match
except I won't repeat "map" in a map setup command name.
2019-11-18 18:21:57 +01:00
Rangi
89d107b426 Decimal values for Pokémon cry parameters 2019-11-03 14:39:56 -05:00
Rangi
4aeab6b879 Rename buttonsound to promptbutton 2019-11-03 12:48:54 -05:00
Rangi
01f68fcc6a Rename TILESET_BATTLE_TOWER to TILESET_BATTLE_TOWER_INSIDE 2019-11-03 12:03:37 -05:00
mid-kid
86061d37d2 More mobile SDK documentation
Labelled WRAM addresses, added constants for mobile commands, fixed some
mobile lib function names, documented most of the functions for specific
commands.
2019-10-21 00:42:36 +02:00
mid-kid
e3e0bcd653 #641 fixes and additions. (#646)
Name a lot of text labels according to our conventions
2019-10-20 18:24:17 -04:00
Ryan Tandy
abee217ce0 Fix swapped comments in data/trainers/dvs.asm
Bugsy has trainer class id 3 and his DVs are 9/8/8/8.
Whitney has trainer class id 2 and her DVs are 8/8/8/8.
2019-08-27 16:23:27 -07:00
mid-kid
b6277408a0 Misc fixes 2019-06-04 13:31:22 +02:00
mid-kid
649c8d38da Get rid of _CRYSTAL
Having this here is completely redundant and useless, and doesn't even
work since it should use `if DEF(_CRYSTAL)` instead.
2019-05-25 17:59:50 +02:00
Rangi
b24cd55f96 Correct the older+younger haircut brothers' labels and constants 2019-05-18 13:27:32 -04:00
Rangi
7890fae995 Some more GB Printer documentation 2019-05-11 13:01:59 -04:00
Rangi
689acb0e36 Try to identify more of maps/unused/Beta*.blk 2019-04-20 14:45:20 -04:00
Rangi
22cc0c25e9
Merge pull request #625 from pret/aus
Build Australian Crystal.
2019-04-14 15:30:51 -04:00
IIMarckus
9f7d30439e Build Australian Crystal. 2019-04-14 13:22:45 -06:00
Rangi
5cdf4f9ae0
Merge pull request #623 from mid-kid/patch-1
Create some battle tower SRAM labels
2019-04-13 11:50:43 -04:00
Rangi
1ada06f576
Merge pull request #622 from mid-kid/master
TextBox -> Textbox
2019-04-13 11:50:16 -04:00
mid-kid
c5a4c0bd2e Create some battle tower SRAM labels 2019-04-12 13:58:49 +02:00
mid-kid
3e78e5b2b6 TextBox -> Textbox
Homogenizing names.
2019-04-09 16:09:18 +02:00
Fontbane
a3119736fa common_1 text documentation
Should be almost everything besides some of the mobile stuff and some debug text.

Removed VS stuff

oops
2019-03-16 13:00:44 -04:00
Rangi
79dc22c769 Define constants for map event sizes 2019-03-03 14:19:16 -05:00
Rangi
dc396822d7 Identify more collision-related constants and data 2019-03-03 13:30:27 -05:00
mid-kid
80ece33e3e Document wBattleAnimFlags
`anim_clearsprites` was misnamed, so I renamed it to `anim_keepsprites`,
and documented it in docs/battle_anim_commands.md
2019-02-16 12:55:40 +01:00
mid-kid
4154f191e0 Anotate more of the battle anim subsystem
The X and Y flip flags can be applied through the stack consisting of:
- Object attributes
- Animation frame attributes
- OAM Data
Each of these negate eachother.

Confused yet? The same stack is traversed to obtain the final tile ID,
with an added layer on top for the base GFX offset and the offset for
the dynamically loaded GFX requested by the object!

wBattleAnimDelay is populated with the values passed to `anim_wait`.
2019-02-15 03:01:59 +01:00
mid-kid
469c51d086 dorepeat -> dowait for oam animations
Having the pic animation macros be the same as the oam animation macros
isn't really turning out so well... I wonder if we should split them up
eventually.
2019-02-15 02:54:35 +01:00
Rangi
1853e3d127 Say "BANK(Foo) ; aka BANK(Bar)" to clarify that Foo and Bar share a bank 2019-01-12 15:17:20 -05:00
Rangi
b975f3e068 Clean up some Odd Egg and Battle Tower code and data
Fixes #589
2019-01-02 19:04:50 -05:00
Rangi
afbf1b3ffc *PhoneScript1 -> *PhoneCalleeScript, and *PhoneScript2 -> *PhoneCallerScript 2018-12-31 16:32:04 -05:00
Rangi
22657f6078 Split generic phone caller+callee text into individual NPCs 2018-12-30 19:20:45 -05:00
Rangi
d3e0eda398 Distinguish "caller" and "called" phone scripts+text (NPCs call you automatically, you call them from the Pokégear) 2018-12-30 18:05:26 -05:00
Rangi
059e0df298 $56 is "<……>" 2018-12-30 17:57:56 -05:00
Rangi
e025ab9db0
Merge pull request #578 from mid-kid/master
Fixes in the animation subsystem.
2018-12-09 17:44:09 -05:00
mid-kid
c4979d9770 Rename "feet and head follow" commands
The lot of these were rather misnamed, since they're used to replace
part of the player or enemy with objects for several background effects.
https://github.com/pret/pokecrystal/pull/578#issuecomment-440996244
2018-11-25 23:57:38 +01:00
mid-kid
5dfe652ff6 CalcStats -> CalcBattleStats
Confusingly ambiguous name
2018-11-23 23:03:27 +01:00
mid-kid
2746288030 Define ANIM_GFX for PLAYER and ENEMY
These are used where the head or the feet of the player/enemy have to be
moved in an animation, and shouldn't overlap. These aren't actual GFX
and should be loaded with the proper commands, and they're always loaded
at the end of the VRAM area.

Furthermore, I've defined BATTLEANIM_BASE_TILE, which is the tile from
which battle animation graphics may start to load. This value was picked
to make sure at least an entire pokemon pic fits in the area before it,
even though it doesn't seem very used...
2018-11-21 23:44:31 +01:00
mid-kid
32833adef3 Use ANIM_GFX constants for battle animations 2018-11-21 22:35:36 +01:00
mid-kid
4e3ed078f9 Cosmetic fixes 2018-11-20 21:53:45 +01:00
Rangi
3202c4f3df Resolve issue #575: Rename text commands 2018-11-18 12:41:11 -05:00
mid-kid
b92b91df17 Adapt tmhm for consistency
Using an underscore before macro variables avoids cluttering up the
global namespace. While this isn't much of a problem right now, it's
good practice that'll keep us from problems in the future.
2018-11-11 00:50:53 +01:00
mid-kid
814a720e9d Adapt macro based on suggestions 2018-11-11 00:32:05 +01:00
mid-kid
375963349a Finish new connection macro
Tried simplifying things a bit, although not nearly as much as I wanted.
Ideally, we'd either have one of two situations:
- A single set of calculations based on values depending on the
direction of the connection
- A bunch of "generic" calculations done before applying simple
modifiers to them in the final `if` block

Right now it's an icky mix of both and I'm not really sure what to make
of it.
2018-11-10 14:34:49 +01:00
mid-kid
abb9454307 Make the connection macro simpler to use
It now only takes one numerical parameter, which is the offset of the
target map relative to the source map, much like in AdvancedMap. This
makes it easier to make connections and avoids having to calculate these
values by hand, and/or "mess with the values 'till it works", as many
have been doing thus far. It's just one, easy-to-understand value.

To convert from the old macro to the new macro, just take the fourth and
the fifth parameter, and calculate `<4th_param> - <5th_param>`. The
result is the value required for the new macro.
2018-11-06 21:19:07 +01:00
Rangi
0ce8dd75cd gfx/roofs/*.png filenames match ROOF_* constants 2018-10-31 17:46:18 -04:00
Rangi
cac641a5ed normal.gbcpal → front.gbcpal
Eliminate redundant Makefile rules
Keep Makefile's Pokemon-specific hack rules next to the misc file-specific graphics rules
2018-09-01 20:18:55 -04:00
Rangi
36b21b39d8 Fix #537: Palettes generated from PNGs use .gbcpal directly.
This avoids overwriting a .pal file from a .png with the same name.
It also prevents people from trying to edit generated .pal files.
2018-08-31 21:39:17 -04:00
Rangi
39faa7a9f6 Update file paths in comments 2018-08-19 13:33:35 -04:00
mid-kid
50da83cb23 CheckDestinyBond -> CheckFaint
Its main function is fainting the opponent and ending the move effect.
Updated the comment accordingly.
2018-08-17 20:16:37 +02:00
mid-kid
f5cd6341ff Consistency with order of constant comments 2018-08-07 20:53:14 +02:00