Commit Graph

4183 Commits

Author SHA1 Message Date
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
a63d9dfd4f
Merge pull request #507 from yenatch/master
fix label from the wrong bank in the title screen
2018-04-11 23:40:29 -04:00
yenatch
436f4829b5 fix label from the wrong bank in the title screen 2018-04-10 22:42:25 -04: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
yenatch
e4b41fad4f
Merge pull request #495 from mid-kid/master
Use stadium 2 egg group names
2018-04-09 21:19:51 -04:00
Rangi
53ff57ca66 Correct map constant comments 2018-04-09 18:58:10 -04:00
Rangi
7307fc8dce Use constants for bit/set/res more 2018-04-05 11:44:02 -04:00
mid-kid
1b12109cb0 HanleDefrost -> HandleDefrost 2018-04-05 11:41:06 +02: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
80d437d565 Fix some uses of EFFECTIVE 2018-04-05 07:54:20 +02:00
mid-kid
28c6eb8341 Use data/items/pocket_names.asm 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
99df17d571 Move more code from home.asm into home/ 2018-04-05 00:35:14 -04:00
Rangi
1e1bbbbf8c check_nick_errors → correct_nick_errors; matches correct_party_errors 2018-04-05 00:04:53 -04: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
yenatch
fe4377ce53
Merge pull request #501 from mid-kid/reorg
Organize the engine/ directory
2018-04-04 21:04:14 -04:00
mid-kid
38107209a6 Update docs and comments to reflect renames 2018-04-04 23:44:24 +02: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
2958188fc6 Document more Beat Up-related bugs
Two bugs related to not raising the substitute when it should, one bug
related to not running king's rock when it should, and the other related
to running king's rock when it shouldn't. Fun.
2018-04-04 22:41:18 +02:00
mid-kid
800f948914 Label BattleCommand_BeatUpFailText 2018-04-04 22:40:35 +02:00
mid-kid
c1e3d17769 endloop loops back to critical itself
The comments seemed to specify that `endloop` loops back to the command
before `critical` and executes that, which simply isn't true. It loops
back to `critical` itself, and executes `critical`, before continuing on
with the remaining commands.
2018-04-04 22:40:26 +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
mid-kid
e1da37e033 Comment SapHealth
Also fixed some Beat Up inconsistencies to make it more readable.
2018-04-04 22:35:47 +02:00
mid-kid
d3cc861d33 Fix snake_case filenames
Renamed a bunch of files, most of them one-off functions, to better fit
the general snake_case naming scheme. Also renamed some awfully long filenames.
2018-04-04 22:26:07 +02:00
Rangi
145efc1353 Use constants for screen size in metatiles 2018-04-04 16:14:48 -04: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
mid-kid
91a768b243 Update file paths in constants/ and docs/ 2018-04-01 17:01:51 +02:00
mid-kid
05ba221eb5 flagpredef.asmsmallflag.asm 2018-03-25 19:14:26 +02:00
mid-kid
be76ee56a8 Organize the engine/ directory, director's cut
Cleaned up `engine/routines`, in favor of moving files into more
appropriate directories. predef-related routines are now in top-level
`engine`.
`rtc/delete_save_change_clock.asm` has been split into both
`menus/delete_save.asm` and `rtc/reset_password.asm`.

Made a new subdirectory:
* engine/math: Contains all generic math-related routines.
2018-03-25 18:24:14 +02:00
Rangi
7676f7d22e Merge branch 'master' of https://github.com/pret/pokecrystal 2018-03-25 11:38:24 -04:00
yenatch
0c446367ce
Merge pull request #500 from yenatch/fix-scan-includes
Fix scan_includes matching the word "include" in strings.
2018-03-25 11:19:59 -04:00
mid-kid
0d9241889f Organize the engine/ directory, take 3
Renamed `title` to `movies`.
Moved some functions from `engine/routines/` to their fitting
directories, and cleaned up the base `engine/` directory.
Moved `engine/pokemon/tmhm.asm` back to `engine/items/`.

Made a new subdirectory:
* engine/tilesets: Contains all map-related graphics routines.
2018-03-25 16:18:33 +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
mid-kid
60e21a8663 Move init_gender and intro_menu to menus
They are actually some kind of menus, and as such make sense there.
2018-03-14 13:38:36 +01:00
mid-kid
97c511cd2f Organize the engine/ directory, take 2
Renamed `game` to `games` and `menu` to `menus`.
Moved some functions from `engine/routines/` to their fitting subdirectories.

Made two new subdirectories:
* engine/rtc: Contains all RTC-related things. Menus, hardware, misc
functions.
* engine/items: Contains all item-related things. Pack, item effects,
other item handlers.
2018-03-14 13:28:36 +01:00
mid-kid
baa0dc5a96 Organize the engine/ directory
This is an informed attempt at reorganizing the engine/ directory by
creating categorized subdirectories, in order to make it easier to
navigate and find things.

The directories created are as follows:
* engine/game: Contains all "minigames", things like the unown puzzle
and slot machine.
* engine/gfx: Contains all handling of graphics. From loading palettes
to playing animations.
* engine/link: Contains all multiplayer functionality.
* engine/menu: Contains all generic/misc. menus and menu code.
Other, more specialized menus are in their own subdirectories (pokedex,
pokegear, party menu, etc).
* engine/overworld: Contains all handling of the overworld. From loading
and connecting maps to wild encounters and the scripting engine.
* engine/pokegear: In the same vein as engine/pokedex, except it could
use some more splitting up.
* engine/pokemon: Contains everything related to manipulating pokemon
data. From the pokemon storage system to evolution and mail.
* engine/printer: Contains everything related to printing things as well
as the printer communication.
* engine/title: Contains intro sequences, title screens and credits.
2018-03-13 13:21:40 +01:00
yenatch
8efa0dcfb0 Fix scan_includes matching the word "include" in strings. 2018-03-10 18:20:31 -05:00
yenatch
12070ca500
Merge pull request #496 from Rangi42/master
Label more map scripts; document more bugs [ready to merge]
2018-03-10 16:16:03 -05:00
yenatch
b2f5362ec3
Merge pull request #499 from surskitty/master
A few labels
2018-03-10 16:14:58 -05:00
yenatch
4e4d9c9083 Merge remote-tracking branch 'surskitty/master' into master 2018-03-10 16:10:00 -05:00
surskitty
96dcc3c0ca Labels, labels. 2018-03-07 22:27:35 -05:00
surskitty
55c69c4871 Sprout Tower labels 2018-03-07 22:13:24 -05:00
surskitty
1de25bc957 Labelling Erika and Celadon Gym 2018-03-07 22:05:14 -05:00
Rangi
ab2677277e 201 -> 200 2018-03-04 02:30:31 -05:00
Rangi
159a0ef7b4 Bug docs match code 2018-03-04 02:29:39 -05:00