pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-09-09 09:51:34 -07:00
Code Issues Packages Projects Releases Wiki Activity
5,296 Commits 1 Branch 0 Tags 52 MiB
5d94f1c7b4
Commit Graph

590 Commits

Author SHA1 Message Date
Rangi
11dc805de0 Revert "Factor out tables into data/overworld/" 
This reverts commit b5a7e7de3e.
 2020-07-22 20:21:26 -04:00
Rangi
b5a7e7de3e Factor out tables into data/overworld/ 
Fixes #749
 2020-07-22 15:22:58 -04:00
Rangi
212846af57 Treat map setup commands like trade script commands 
Fixes #736
 2020-07-22 13:37:43 -04:00
Rangi
a9941e28cc Define NUM_FLYPOINTS 2020-07-21 11:48:39 -04:00
Rangi
59d9932255 SPRITE_GYM_GUY -> SPRITE_GYM_GUIDE 2020-07-17 13:01:48 -04:00
Rangi
eca33ef190 Define map setup commands as macros like other script commands 2020-07-13 20:44:16 -04:00
Rangi
6ca82e5c86 Eliminate enum: use const instead, with case-by-case parallel const implementations 2020-07-08 15:30:23 -04:00
Rangi
43a9295789 add_tm, add_hm, and add_mt define TM##_MOVE, HM##_MOVE, and MT##_MOVE constants, to avoid repeating the move names in tmhm_moves.asm 2020-07-06 16:53:05 -04:00
Rangi
26d764de5d Use STRCMP, not ==, to compare multi-character strings 2020-07-02 11:46:30 -04:00
Rangi
fce6243b43 Identify more labels, and use the jumptable macro when possible 2020-07-01 13:13:49 -04:00
Rangi
c3c18dd196 Comment more ROM labels as unreferenced 
(Some unreferenced labels are above code which is still used via fallthrough!)
 2020-06-21 18:33:31 -04:00
Rangi
91774f206e Replace "Unreferenced" labels with "; unreferenced" comments 2020-06-21 16:27:43 -04:00
Rangi
ac0025064f Identify some more Unknown labels 2020-06-20 18:52:26 -04:00
Rangi
f2550fc3c2 ReplaceKrisSprite -> UpdatePlayerSprite 2020-06-16 19:38:00 -04:00
Rangi
7b2515d1e4 [in progress] Harmonize more constant and data files with pokegold 2020-06-16 14:32:57 -04:00
Rangi
b9f2b93c17 Harmonize some more symbols with pokegold 2020-06-16 11:28:52 -04:00
Rangi
75035a71a5 Label some mobile addresses, and revise some comments 2020-06-13 18:48:26 -04:00
Rangi
518cee440e Resolve #723: treat std scripts like specials and predefs 2020-06-10 16:44:16 -04:00
Rangi
60f7ca4006 Group MoveDescriptions with PrintMoveDesc and rename that to PrintMoveDescription (like ItemDescriptions with PrintItemDescription) 2020-05-25 03:54:42 -04:00
Rangi
5f197c53f4 Clean up some percentage values 2020-05-07 14:21:24 -04:00
Rangi
905833ef8c Use a FIRST_UNOWN_CHAR constant for the Unown font 2020-05-06 10:34:51 -04:00
Rangi
b69526a908 Miscellaneous fixes 
Addresses the haircut brothers' probability comments in #709
 2020-05-05 10:17:02 -04:00
Rangi
20464d1bfb Miscellaneous updates 
- `PREDEFPAL_00` -> `PREDEFPAL_ROUTES` (observed from `LoadSGBLayout.GetMapPalsIndex.route`)
- `$0` -> `PLAYER` (standard person ID)
- Fix some whitespace formatting
 2020-04-30 11:27:32 -04:00
Rangi
0ef004a4db dsprite y, ypx, x, xpx, off, attr -> dbsprite x, y, xpx, ypx, off, attr 2020-04-04 16:00:30 -04:00
Andrew Cook
5d97f15f80
Assorted labels in mobile related code (#702) 
Rename assorted labels in mobile-related code
 2020-03-31 21:26:59 -04:00
Rangi
0345e4fb0e Add suffixes to some constants to avoid ambiguity 
- `PSYCHIC` → `PSYCHIC_TYPE` (not the trainer `PSYCHIC_T` or the move `PSYCHIC_M`)
- `BLACKBELT` → `BLACKBELT_I` (not the trainer `BLACKBELT_T`)
- `CURSE_T` → `CURSE_TYPE` (not the move `CURSE`)
- `TOWN_MAP_D` → `TOWN_MAP_POSTER` (not the item `TOWN_MAP`)

This also uncovered a misidentified event: `EVENT_DECO_PLANT_4` → `EVENT_DECO_POSTER_1`. (There are three plants and four posters.)
 2020-03-21 17:59:26 -04:00
Rangi
6a6ba10315 rgbds supports 'X - 1' instead of 'X + -1' 2020-03-21 14:01:05 -04:00
Rangi
5a5f5ececd Miscellaneous fixes from #694 2020-03-21 13:07:18 -04:00
Rangi
ad50e94b50 Add a LANDMARK_ prefix to landmark constants 
Resolves #697
 2020-03-15 19:50:39 -04:00
Rangi
65f22544e0 Refactor flypoints to separate const definition from data usage 2020-03-15 14:10:53 -04:00
Rangi
a73ced3b69 unused_dark_cave -> unused_johto (goes with the beta Johto town+city maps) 2020-02-25 19:18:24 -05:00
mid-kid
9a927c1b3e
Merge pull request #685 from mid-kid/master 
Moshi moshi? minoru enhansumentsu desu
 2020-02-21 21:11:36 +01:00
Rangi
88bbdb6a2f Define TileCollisionTable as a standard 'db' series 2020-02-13 19:07:19 -05:00
mid-kid
26b8bf003e Standardize on lowercase Tilemap and Attrmap 
We used to have a mixture of TileMap and and Tilemap, as well as the
similar AttrMap. Standardize on one.
 2020-02-13 18:31:10 +01:00
Rangi
ceadab8cd1 PnP_HiddenPlaces -> PnP_Places 
The "Places & People" radio station does not avoid these maps; it only describes these maps.
 2020-02-06 11:07:42 -05:00
Rangi
d482dc28f4 Identify four padding bytes in base data as beta front/back pic pointers 2020-02-04 11:07:16 -05:00
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
mid-kid
f98a95b8ee wWeeklyFlags -> wDailyFlags2 
These are by far not always checked each week, and as such shouldn't be
called that.
Since they're almost always used through the `bit` instruction, it's
very inconvenient to just make wDailyFlags a `dw` instead.
 2018-08-07 09:46:21 +02:00
Rangi
c9cb67141b Make reviewed fixes; standardize on " + " 2018-07-29 01:40:23 -04:00
Rangi
8935e6f1ca wDeciramBuffer → wBreedingCompatibility in UnknownText_0x1bd0d8 2018-07-29 00:48:03 -04:00
Rangi
9dec80b07e Add meaningful aliases for wd265 
Introduce MONICON_* constants
Introduce BATTLEPLAYERACTION_* constants
 2018-07-29 00:25:52 -04:00
Rangi
c2925d6406 db $0, $0 → dn 0, 0, 0, 0 ; DVs 2018-07-24 14:28:04 -04:00
mid-kid
1fc7430a2b Fix misnamed character codes 
Some character codes were erroneously named after their text command
counterparts. This has caused a lot of confusion with naming their
functions and with other things.

I've also removed the `dict2` macro and expanded the `dict` macro. This
really isn't something we should be doing for macros but I can't deny it
looks a lot neater than repeated code.
 2018-07-18 10:55:30 +02:00
Rangi
b23f0b2bda Fewer uses of 'Thing2 - Thing1' for sizeof(Thing) 2018-07-16 15:58:07 -04:00
Rangi
d9b44d4423 Consistently use dn for DVs 2018-07-16 15:42:45 -04:00
Rangi
33ad00f1ab Tile values agree in data/sprites/emotes.asm and data/sprites/facings.asm 2018-07-15 11:26:35 -04:00
Rangi
874bc5ebd5 SFX_UNKNOWN_7F → SFX_TOXIC 2018-07-12 12:25:17 -04:00
Rangi
48e209763f SFX_DEX_FANFARE_50_79 and SFX_LEVEL_UP use identical data, and technically the level-up text plays the former 2018-07-11 13:24:48 -04:00
Rangi
5e6837807c landmark macro includes the +8/+16 offsets for X/Y coordinates 2018-07-07 00:59:27 -04:00
Rangi
23450e6b4c Correct file path 2018-07-05 18:59:56 -04:00
Rangi
255f282a60 Use TRUE/FALSE for wSaveFileExists 2018-07-04 02:50:27 -04:00
Rangi
b565e6a9dc Miscellaneous reorganization fixes 2018-07-04 02:42:11 -04:00
Rangi
67152eab98 Keep more data/ INCLUDEs with relevant routines 2018-06-25 13:45:50 -04:00
Rangi
5693cc49cf Single newline at the end of files 2018-06-25 12:07:35 -04:00
Rangi
9f3e9145f9 Remove more triple newlines 2018-06-25 12:01:02 -04:00
Rangi
0f074e2ad1 "→" should be "ェ" 2018-06-24 23:55:18 -04:00
Rangi
67d1364c7a Fix triple newlines left over from removing address comments 2018-06-24 23:22:50 -04:00
Rangi
9afaed9b8f Remove more address comments 2018-06-24 21:39:23 -04:00
Rangi
c7032617aa Remove address comment 2018-06-24 21:28:26 -04:00
Rangi
e2fb7acac0 Merge branch 'master' of https://github.com/pret/pokecrystal 
# Conflicts:
#	engine/items/mart.asm
 2018-06-24 21:23:51 -04:00
mid-kid
5efce10789 Remove even more address comments 
That should be all of them this time
 2018-06-25 02:10:37 +02:00
mid-kid
1d9a68dbdd Remove all address comments 2018-06-24 16:13:22 +02:00
Rangi
5cbff21a0d Unreferenced_53d84 → Unreferenced_MonPicBanks from pokegold-spaceworld 2018-06-24 01:13:59 -04:00
Rangi
fbe82a7fe0 Note which labels are only needed for locating banks (relevant to issue #485) 2018-06-12 23:29:15 -04:00
Rangi
9ac2583b20 Use dn 2018-06-06 18:49:16 -04:00
Rangi
09d1ac8725 Specify DVs individually 2018-06-06 11:45:19 -04:00
yenatch
dbf05e48eb
Merge pull request #517 from mid-kid/master 
Some fixes all around
 2018-06-05 07:04:54 -04:00
yenatch
c61d6a3a5a Fix other unused shiny check label 2018-06-05 06:58:25 -04:00
mid-kid
e8f847b537 Use structure constants for channel_struct 2018-06-04 11:35:27 +02:00
Rangi
1840af8b4f Identify more sprite move data flag bits 2018-05-23 22:01:21 -04:00
Rangi
85f7328bf8 Identify USE_OBP1_F 2018-05-23 20:44:32 -04:00
Rangi
50ea6d6e22 WALKS_ON_WATER → SWIMMING 2018-05-23 19:10:15 -04:00
Rangi
c85b32ed80 More sprite movement data flag constants 2018-05-23 19:06:04 -04:00
Rangi
c5d18de8ff Use known sprite movement data flag constants 2018-05-23 13:15:07 -04:00
Rangi
32b92ca51c Start improving sprite movement engine (to do: identify bit flags) 
Introduce maskbits N[, S]: optionally shift the bitmask
 2018-05-23 12:48:14 -04:00
Rangi
03570a514e Correct comment 2018-05-19 13:16:18 -04:00
Rangi
d5fff8aa96 Constants for PC menu indexes 
'db  ' -> 'db '
 2018-05-18 22:18:00 -04:00
Rangi
8acc8d6e30 Merge branch 'master' of https://github.com/pret/pokecrystal 2018-05-06 22:45:07 -04:00
Rangi
1c92cb8b48 'rept' is not indented 2018-05-06 12:16:57 -04:00
Rangi
d31ba05aeb Combine bit flags with | not + 2018-05-05 19:27:10 -04:00
Rangi
de0b344be4 Explicit NO_LIMITS instead of 0 2018-05-05 19:19:51 -04:00
Rangi
5a9975c541 Use explicit HELD_NONE, not 0 2018-05-05 15:36:04 -04:00
mid-kid
c82deab86f fix-various-little-things 
A compilation of suggestions from the discord that don't deserve
separate commits and are not questionable at all™.
 2018-05-05 09:19:04 +02:00
yenatch
40b537d45b
Merge pull request #503 from Rangi42/master 
Factor wMisc into meaningful parts; move most code out of home.asm
 2018-04-09 21:30:24 -04:00
mid-kid
2d8f3a0654 Use Stadium 2 Egg Group names 
Out of the current two most prevalent official conventions, this one was
chosen, because they're used in a direct counterpart to this game, and
thus feel more accurate.
 2018-04-05 07:54:20 +02:00
mid-kid
1891879b62 GENDERLESS -> GENDER_UNKNOWN 
This is how they're called in official sources, and it fits better with
the other `GENDER_` constants.
 2018-04-05 07:54:20 +02:00
Rangi
81306889e3 Merge branch 'master' of https://github.com/pret/pokecrystal 2018-04-04 23:56:40 -04:00
yenatch
f750d4f418
Merge pull request #505 from mid-kid/battlecommands 
Battle command fixes
 2018-04-04 21:18:15 -04:00
mid-kid
d4025863cf Rename some battle commands 
`hittarget` was misleading, as it doesn't actually "hit" the target, it
only plays the animation. As such, I've renamed it to `moveanim`.

`checkfaint` has nothing to do with checking if the user or target has
fainted, instead, it applies wCurDamage onto the target's HP, hitting
the substitute if applicable. I've renamed the command to `applydamage`
and all of its subfunctions accordingly.
 2018-04-04 23:27:40 +02:00
mid-kid
800f948914 Label BattleCommand_BeatUpFailText 2018-04-04 22:40:35 +02:00
mid-kid
682ca7e93c Label bidefailtext 
This "unknown" battle command is actually used to give the proper fail
message to bide.
 2018-04-04 22:40:21 +02:00
Rangi
aec3802587 Use 'elif' more 2018-04-04 14:06:25 -04:00
mid-kid
81fff9bb80 Fix file permissions 
I have no idea why this was a thing (do people store this repo on FAT32
flash drives or something?), but quite a bit of files had a permission
of 755. This isn't really a problem, but it's inconsistent and weird.
 2018-04-01 17:05:10 +02:00
Rangi
0447ee0cf9 Relabel some map-related WRAM 
wMisc -> {wSurroundingTiles, wBoxPartialData, wLink_c608}
wOverworldMap -> {wOverworldMapBlocks, wHallOfFamePokemonList}
 2018-03-19 11:36:14 -04:00
Rangi
e2c15b0b92 * BillPhoneGeneriText -> BillPhoneGenericText 
* data/phone/text/trainers1.asm -> data/phone/text/trainers.asm
* ,ROM -> , ROM0
 2018-02-26 22:29:09 -05:00
Rangi
f0b01a4eea Document more quirks and bugs 2018-02-26 13:41:48 -05:00
Rangi
9a7da21006 Mention "HAUNTED HOUSE" (resolves #492) 2018-02-25 22:25:32 -05:00
Rangi
b254a4571d ENGINE_BUG_CONTEST_ON -> ENGINE_MAIN_MENU_MOBILE_CHOICES (resolves #490) 
Went with CHOICES instead of HIDDEN since setting the flag would presumably have shown the items, not hidden them
 2018-02-25 22:23:20 -05:00
Rangi
2f9a0d7d9f Pokecom Center Admin Room -> Office 2018-02-25 22:19:17 -05:00
Rangi
335c2699f0 Merge branch 'master' of https://github.com/pret/pokecrystal 
# Conflicts:
#	constants/map_constants.asm
#	constants/wram_constants.asm
#	data/radio/oaks_pkmn_talk_routes.asm
#	data/radio/pnp_hidden_places.asm
#	engine/battle/core.asm
#	engine/breeding.asm
#	engine/phone/phone_scripts.asm
#	engine/radio.asm
#	maps/BattleTower1F.asm
#	maps/OlivineLighthouse2F.asm
#	maps/OlivineLighthouse6F.asm
#	maps/PokemonFanClub.asm
#	maps/RadioTower1F.asm
#	maps/RadioTower2F.asm
#	maps/Route30BerryHouse.asm
#	maps/Route34IlexForestGate.asm
#	maps/Route36NationalParkGate.asm
#	maps/RuinsOfAlphKabutoChamber.asm
#	maps/RuinsOfAlphResearchCenter.asm
#	maps/VermilionPort.asm
#	maps/VictoryRoad.asm
 2018-02-25 20:39:54 -05:00
yenatch
f44f306cfd
Merge pull request #477 from mid-kid/master 
Medium-sized cleanups
 2018-02-25 20:12:59 -05:00
Rangi
60add76ee7 * Remove rept 4 (fa3192e) 
* FindGreaterThanThatLevel -> FindAboveLevel (132fe46)
* More meaningful egg group names (0eeb00d)
 2018-02-25 19:23:01 -05:00
Rangi
cbd423ec08 Format map object attributes like trainer attributes, in preparation for bit flag constants 2018-02-25 16:49:03 -05:00
Rangi
eb3726bba0 NO_ITEM == 0 2018-02-25 16:48:31 -05:00
Rangi
e018a9d005 Sprite data values match GetSpriteLength return values and are not limited to multiples of 4 2018-02-25 16:32:40 -05:00
mid-kid
e8bc86d1fe Pkmn -> Mon 
Since we're aiming for consistency across the codebase, I believe it
includes a uniform way to refer to the creatures this game consists of
in the labels of the code.
The only exceptions to this rule are labels referring to things named
through the use of the <PK><MN> or <PKMN> characters, in which case PKMN
is used.

Most of this was already consistent enough™, I just picked the
convention with the most occurences and fixed the outliers.
 2018-02-22 17:39:06 +01:00
Rangi
612fd7cb96 Merge branch 'master' of https://github.com/pret/pokecrystal 
# Conflicts:
#	maps/KrissHouse2F.asm
 2018-02-15 21:21:58 -05:00
mid-kid
89c5f0adf0 Comment GeneratePartyMonStats 2018-02-09 22:21:59 +01:00
Rangi
62d6f72bb3 Make tileset palette maps easier to edit 2018-02-09 13:50:20 -05:00
Rangi
96c058f0a7 No redundant item effect labels 2018-02-05 13:03:05 -05:00
luckytyphlosion
8b007e8d51 Fix more w-izing edge cases. 2018-02-04 22:45:04 -05:00
Rangi
f8f3294130 Add ROOF_ constants 2018-02-04 21:39:46 -05:00
Rangi
885080f213 "chances" → "probabilities", since other files use that term and "changes" exists right next to it 2018-02-04 11:46:53 -05:00
Rangi
32ed487a47 Merge branch 'master' of https://github.com/pret/pokecrystal 
# Conflicts:
#	audio/engine.asm
#	constants/gfx_constants.asm
#	constants/map_data_constants.asm
#	constants/pokemon_data_constants.asm
#	constants/sprite_constants.asm
#	constants/wram_constants.asm
#	data/maps/data.asm
#	engine/battle/ai/scoring.asm
#	engine/battle/core.asm
#	engine/battle/effect_commands.asm
#	engine/battle/misc.asm
#	engine/battle_anims/getpokeballwobble.asm
#	engine/breeding.asm
#	engine/buy_sell_toss.asm
#	engine/decorations.asm
#	engine/events/battle_tower/battle_tower.asm
#	engine/events/battle_tower/rules.asm
#	engine/events/buena.asm
#	engine/events/bug_contest/contest_2.asm
#	engine/events/daycare.asm
#	engine/events/dratini.asm
#	engine/events/halloffame.asm
#	engine/events/happiness_egg.asm
#	engine/events/kurt.asm
#	engine/events/lucky_number.asm
#	engine/events/magnet_train.asm
#	engine/events/overworld.asm
#	engine/events/pokerus/pokerus.asm
#	engine/events/print_unown.asm
#	engine/events/print_unown_2.asm
#	engine/events/unown_walls.asm
#	engine/item_effects.asm
#	engine/link.asm
#	engine/mon_menu.asm
#	engine/player_object.asm
#	engine/routines/playslowcry.asm
#	engine/scripting.asm
#	engine/search.asm
#	engine/search2.asm
#	engine/specials.asm
#	engine/start_menu.asm
#	engine/timeset.asm
#	home/battle_vars.asm
#	home/map.asm
#	maps/GoldenrodUndergroundSwitchRoomEntrances.asm
#	maps/IlexForest.asm
#	maps/KrissHouse2F.asm
#	maps/Route39Barn.asm
#	mobile/mobile_12_2.asm
#	mobile/mobile_40.asm
#	mobile/mobile_5f.asm
#	wram.asm
 2018-02-03 19:42:56 -05:00
Rangi
6ff2cb20e6 map → map_id; map_def → map; map_data → map_attributes 2018-02-03 17:11:55 -05:00
Rangi
bf138d94d4 scene_def → scene_var (for "variable", like loadvar, copybytetovar, etc) 2018-02-03 16:20:19 -05:00
Rangi
e32e5212af use "x + -1" not "x +- 1" 
(TODO: use "x - 1" once rgbds allows it)
 2018-02-02 22:55:38 -05:00
Rangi
323ef81286 More comments and macros 2018-02-01 15:19:27 -05:00
Rangi
936a170e0d MobileTradeRoom matches MobileBattleRoom 2018-01-31 23:21:15 -05:00
Rangi
a17623d96b Add scene ID constants (TODO: meaningful names) 2018-01-31 23:16:51 -05:00
Rangi
7d6e82ef1c NPC trade constants don't all just start with TRADE_ 2018-01-31 21:16:57 -05:00
Rangi
0eeb00d6ac Official egg group names 2018-01-31 12:03:43 -05:00
Rangi
b8f4b1b8a7 MINERAL egg group works 2018-01-31 11:45:18 -05:00
Rangi
08891da822 const_def N 2018-01-31 11:38:45 -05:00
Rangi
a9334f7468 Correct engine flag constants 2018-01-31 10:55:35 -05:00
Rangi
50f6007cc2 No need for ==== lines 2018-01-31 10:36:27 -05:00
Rangi
9ac2cea1f7 Align columns 2018-01-31 00:46:03 -05:00
Rangi
96ae7a7ee3 More compact trainer data 2018-01-31 00:37:03 -05:00
Rangi
d260b5f185 Compact trainer data 2018-01-31 00:07:11 -05:00
Rangi
1282405d4a SPRITEMOVEDATA_LAPRAS → SPRITEMOVEDATA_SWIM_WANDER 
(more precise, and encourages hacks to add more SWIM movements)
 2018-01-30 22:42:41 -05:00
Rangi
006d9f6441 Clarify big doll-related constants (Snorlax and Lapras are symmetrical, Onix is not) 2018-01-30 22:34:05 -05:00
Rangi
cb733954c6 SPRITEMOVEDATA_ITEM_TREE → SPRITEMOVEDATA_STILL (it's used for other things like Azalea's Slowpokes, not just items and trees) 2018-01-30 22:12:53 -05:00
Rangi
6e00101b89 Comment values of special pointers, same as predefs 2018-01-30 14:55:27 -05:00
Rangi
5b678b336c Simpler map connection macro 2018-01-30 14:32:57 -05:00
Rangi
4c4fca1028 Clean up comments 
Base data: types uniquely lacked a comment; items on one line; distinguish unknowns
Dex entries: don't imply that pointers don't exist
 2018-01-29 11:35:50 -05:00
Rangi
84c798e9f4 Clarify TM/HM move/enum correspondence 2018-01-28 01:20:49 -05:00
Rangi
e22670438e Badge type boosts make sense in data/types/ 2018-01-28 01:17:32 -05:00
Rangi
ea480fa31e Fix off-by-one error 2018-01-26 20:57:55 -05:00
Rangi
a0cc4a3392 Move power data belongs in data/moves/ 2018-01-26 11:01:15 -05:00
Rangi
6ebe45e41f Move event data to data/events/ 2018-01-25 22:19:24 -05:00
Rangi
87514598be More battle data in data/battle/ 2018-01-25 21:34:42 -05:00
Rangi
d504fb8852 Move AI data tables into data/battle/ai (mirroring engine/battle/ai) so they're more discoverable. 2018-01-25 20:34:33 -05:00
Rangi
518dd46ca1 data/text/X_text.asm is redundant 2018-01-24 21:27:23 -05:00
Rangi
95fd05744d Remove "UnusedSpecial_" prefixes too 2018-01-24 11:20:41 -05:00
Rangi
d719d318e8 Remove Special_ prefix from special routines (close #478) 2018-01-24 11:17:05 -05:00
Rangi
132fe46925 Rename some routines to avoid conflicts when removing "Special_" prefixes 2018-01-24 11:12:02 -05:00
Rangi
505a6595bc EVENT_TEMPORARY_UNTIL_MAP_RELOAD_[1-8] (close issue #481) 2018-01-24 10:46:49 -05:00
luckytyphlosion
a1951cefc0 Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
luckytyphlosion
f2ae74079f Prefix wram labels with w, part 1. 
Handle edge cases first.
 2018-01-23 16:45:34 -05:00
Rangi
ead103d2c6 MenuDataHeader → MenuHeader, MenuData2 → MenuData (might complete issue #440) 2018-01-23 16:08:43 -05:00
Rangi
517eab6526 "Speech" houses just have dialog NPCs 2018-01-23 12:54:17 -05:00