Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
# Conflicts:
# engine/items/mart.asm
|
|
That should be all of them this time
|
|
|
|
|
|
|
|
|
|
|
|
Some fixes all around
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Introduce maskbits N[, S]: optionally shift the bitmask
|
|
|
|
'db ' -> 'db '
|
|
|
|
|
|
|
|
|
|
|
|
A compilation of suggestions from the discord that don't deserve
separate commits and are not questionable at all™.
|
|
Factor wMisc into meaningful parts; move most code out of home.asm
|
|
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.
|
|
This is how they're called in official sources, and it fits better with
the other `GENDER_` constants.
|
|
|
|
Battle command fixes
|
|
`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.
|
|
|
|
This "unknown" battle command is actually used to give the proper fail
message to bide.
|
|
|
|
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.
|
|
wMisc -> {wSurroundingTiles, wBoxPartialData, wLink_c608}
wOverworldMap -> {wOverworldMapBlocks, wHallOfFamePokemonList}
|
|
* data/phone/text/trainers1.asm -> data/phone/text/trainers.asm
* ,ROM -> , ROM0
|
|
|
|
|
|
Went with CHOICES instead of HIDDEN since setting the flag would presumably have shown the items, not hidden them
|
|
|
|
# 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
|
|
Medium-sized cleanups
|
|
* FindGreaterThanThatLevel -> FindAboveLevel (132fe46)
* More meaningful egg group names (0eeb00d)
|
|
flag constants
|
|
|
|
to multiples of 4
|
|
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.
|