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 (132fe460eeb00d
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
