1a888f2200
NUM_GRASSMON * 2
2018-06-24 13:00:55 -04:00
ee48c7a3ed
NUM_WATERMON
2018-06-24 12:32:56 -04:00
d84aabf3c1
WATER_WILDDATA_LENGTH
2018-06-24 12:30:33 -04:00
5a58f90ec6
FISHGROUP_DATA_LENGTH
2018-06-24 11:46:55 -04:00
1d9a68dbdd
Remove all address comments
2018-06-24 16:13:22 +02:00
a4bf94e1d7
wCurMartEnd - wCurMart = 16
2018-06-23 23:15:13 -04:00
f6ef095284
Add STANDARDMART_* jumptable index constants
2018-06-23 22:35:46 -04:00
5c7d04ac84
Use direct tile IDs, not charmap entries, since they don't correspond correctly (e.g. "┌" is not the top-right corner)
2018-06-23 21:12:37 -04:00
0fbc8362b6
Merge pull request #526 from atasro2/master
...
reword
2018-06-20 19:25:39 -04:00
5c662be182
fixed a typo
...
being the grammar nazi i am i noticed a grammar error so i forked pokecrystal to fix it ;)
2018-06-14 00:34:24 +04:30
fbe82a7fe0
Note which labels are only needed for locating banks (relevant to issue #485 )
2018-06-12 23:29:15 -04:00
dbf05e48eb
Merge pull request #517 from mid-kid/master
...
Some fixes all around
2018-06-05 07:04:54 -04:00
5c0e5fa7ca
Fix unused shiny check comments.
2018-06-04 23:36:27 -04:00
5e9c785b3f
Merge branch 'master' of https://github.com/pret/pokecrystal
2018-06-04 11:05:53 +02:00
c7bb2d15cf
Create empty sections for the remaining FixPicBank array entries
2018-06-03 23:25:21 -04:00
7cd5bcbae4
Change FixPicBank bank array
2018-06-03 23:18:31 -04:00
17087489c6
Miscellaneous fixes in the use of _command constants.
2018-06-01 09:04:36 +02:00
4df72a8474
SGB palette roles discovered from Spaceworld beta G/S
2018-06-01 02:11:44 -04:00
a71b7a92b7
Same pic bank solution as pokecrystal
2018-05-29 19:14:04 -04:00
3927bcdb9d
Function6ec1 → CanObjectMoveInDirection
2018-05-24 12:36:35 -04:00
a91aa18dae
Use constants more
2018-05-23 22:13:46 -04:00
1840af8b4f
Identify more sprite move data flag bits
2018-05-23 22:01:21 -04:00
85f7328bf8
Identify USE_OBP1_F
2018-05-23 20:44:32 -04:00
50ea6d6e22
WALKS_ON_WATER → SWIMMING
2018-05-23 19:10:15 -04:00
c85b32ed80
More sprite movement data flag constants
2018-05-23 19:06:04 -04:00
c5d18de8ff
Use known sprite movement data flag constants
2018-05-23 13:15:07 -04:00
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
846e3e65de
adc a, 0 → adc 0; fix comments
2018-05-20 17:55:27 -04:00
9afacc7842
Use REGISTERED_* constants
...
128px wide pack_menu.png matches BGB VRAM viewer, and rows+cols match hex tile IDs (e.g. $24 = row 3 col 5)
2018-05-20 17:50:53 -04:00
ae50b1148a
1 << FRZ == $20
2018-05-19 13:11:50 -04:00
d5fff8aa96
Constants for PC menu indexes
...
'db ' -> 'db '
2018-05-18 22:18:00 -04:00
6e91c3a293
Revert "Fix #511 : eliminate "Left shift of negative value" warnings"
...
This reverts commit aa51dbc612
2018-05-11 00:42:44 -04:00
8acc8d6e30
Merge branch 'master' of https://github.com/pret/pokecrystal
2018-05-06 22:45:07 -04:00
aa51dbc612
Fix #511 : eliminate "Left shift of negative value" warnings
2018-05-06 21:27:47 -04:00
1c92cb8b48
'rept' is not indented
2018-05-06 12:16:57 -04:00
acdb302035
Fix rest of the givepokeitem/checkpokeitem references
2018-05-06 13:48:04 +02:00
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
436f4829b5
fix label from the wrong bank in the title screen
2018-04-10 22:42:25 -04:00
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
7307fc8dce
Use constants for bit/set/res more
2018-04-05 11:44:02 -04:00
1b12109cb0
HanleDefrost -> HandleDefrost
2018-04-05 11:41:06 +02:00
80d437d565
Fix some uses of EFFECTIVE
2018-04-05 07:54:20 +02:00
28c6eb8341
Use data/items/pocket_names.asm
2018-04-05 07:54:20 +02:00
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
1e1bbbbf8c
check_nick_errors → correct_nick_errors; matches correct_party_errors
2018-04-05 00:04:53 -04:00
81306889e3
Merge branch 'master' of https://github.com/pret/pokecrystal
2018-04-04 23:56:40 -04:00
f750d4f418
Merge pull request #505 from mid-kid/battlecommands
...
Battle command fixes
2018-04-04 21:18:15 -04:00
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
800f948914
Label BattleCommand_BeatUpFailText
2018-04-04 22:40:35 +02:00
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
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
e1da37e033
Comment SapHealth
...
Also fixed some Beat Up inconsistencies to make it more readable.
2018-04-04 22:35:47 +02:00
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
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
05ba221eb5
`flagpredef.asm` → `smallflag.asm`
2018-03-25 19:14:26 +02:00
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
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
0447ee0cf9
Relabel some map-related WRAM
...
wMisc -> {wSurroundingTiles, wBoxPartialData, wLink_c608}
wOverworldMap -> {wOverworldMapBlocks, wHallOfFamePokemonList}
2018-03-19 11:36:14 -04:00
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
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
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
7e9dbde549
HOF_MASTER_COUNT EQU 200
2018-03-04 00:27:22 -05:00
bde9ffff6e
Improve some code labels
2018-03-02 19:39:16 -05:00
43b5f90457
Replace "Map<MapName>Signpost<#>Script" labels
2018-02-27 19:33:38 -05:00
e2c15b0b92
* BillPhoneGeneriText -> BillPhoneGenericText
...
* data/phone/text/trainers1.asm -> data/phone/text/trainers.asm
* ,ROM -> , ROM0
2018-02-26 22:29:09 -05:00
5959548c01
Document HOF Master bug ( close #494 )
2018-02-26 11:51:16 -05:00
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
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
f44f306cfd
Merge pull request #477 from mid-kid/master
...
Medium-sized cleanups
2018-02-25 20:12:59 -05:00
f404af8a43
Merge pull request #486 from surskitty/master
...
Another batch of label names
2018-02-25 20:12:31 -05:00
f964d04a87
* loadmenuheader -> loadmenu ( ead103d)
...
* objectface -> turnobject (c834bda
2018-02-25 20:05:37 -05:00
be28a0ff4e
Meaningful $ff values
2018-02-25 19:50:48 -05:00
60add76ee7
* Remove rept 4 ( fa3192e)
...
* FindGreaterThanThatLevel -> FindAboveLevel (132fe460eeb00d
2018-02-25 19:23:01 -05:00
3d34f5a5a3
Label wPokemonWithdrawDepositParameter of RemoveMonFromPartyOrBox
...
It takes a clearly different parameter, completely unrelated and
different in function to PC_DEPOSIT and PC_WITHDRAW.
2018-02-22 21:36:14 +01:00
a22343d32c
Fix TRUE/FALSE constants for CalcMonStats
2018-02-22 18:12:43 +01:00
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
ff3a43d4b0
Use maskbits NUM_TYPES
2018-02-20 10:54:48 -05:00
612fd7cb96
Merge branch 'master' of https://github.com/pret/pokecrystal
...
# Conflicts:
# maps/KrissHouse2F.asm
2018-02-15 21:21:58 -05:00
23b773d5c2
Label some daycare-related functions
2018-02-14 11:51:47 +01:00
f1c23f2153
Fix use of one constant
2018-02-13 08:36:25 +01:00
98e6878429
CalcwBufferMonStats -> CalcBufferMonStats
...
The 'w' was probably added in some mass-replacement.
It's completely irrelevant to the function itself and doesn't fit the
PascalCase model.
2018-02-12 23:58:21 +01:00
89c5f0adf0
Comment GeneratePartyMonStats
2018-02-09 22:21:59 +01:00
c158404b7c
questionmark is not a pokemon pic
2018-02-07 14:43:58 -05:00
118c387d73
Remove commented G/S roaming Suicune code
2018-02-05 22:03:40 -05:00
71f51955c9
Terser name for the does-nothing effect
2018-02-05 13:07:22 -05:00
c648a6ced9
Off by one
2018-02-05 13:05:26 -05:00
96c058f0a7
No redundant item effect labels
2018-02-05 13:03:05 -05:00
8b007e8d51
Fix more w-izing edge cases.
2018-02-04 22:45:04 -05:00
bc3cc69749
Consistent "X percent [+/- Y]" order
2018-02-04 21:21:34 -05:00
d6b00d0cc1
Sync code with wiki
2018-02-04 13:16:40 -05:00
6c405e3859
Keep specials files together
2018-02-04 12:03:31 -05:00
885080f213
"chances" → "probabilities", since other files use that term and "changes" exists right next to it
2018-02-04 11:46:53 -05:00
e668b6cf3a
Merge branch 'master' of github.com:pret/pokecrystal
2018-02-03 22:18:56 -05:00
73ea7c6326
Macro factors out sine code, just like sine data, since it's used 5 times
2018-02-03 21:11:55 -05:00
271aa20b73
Keep documentation in sync with new WRAM labels
2018-02-03 20:40:21 -05:00
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
6ff2cb20e6
map → map_id; map_def → map; map_data → map_attributes
2018-02-03 17:11:55 -05:00
e32e5212af
use "x + -1" not "x +- 1"
...
(TODO: use "x - 1" once rgbds allows it)
2018-02-02 22:55:38 -05:00
45373ec601
sine_wave macro parameterizes table size, not frequency ("amplitude" was an incorrect comment)
2018-02-02 22:45:42 -05:00
c834bdadf2
spriteface → objectface, consistent with the other script commands
2018-02-02 21:50:43 -05:00
Rangi