1494c79688
Labelling Whitney texts
2018-03-02 21:39:29 -05:00
725148443f
Merge pull request #476 from Rangi42/master
...
Resolve some issues; rename some maps; move more tables into data/; warp_def → warp_event (ready to merge)
2018-02-25 22:39:51 -05:00
7453bd1aa8
"HUMANSHAPE, aka Humanshape"
2018-02-25 22:38:09 -05:00
711e2d6143
Mention unused Battle Tower-related text ( resolves #491 )
2018-02-25 22:33:07 -05:00
9a7da21006
Mention "HAUNTED HOUSE" ( resolves #492 )
2018-02-25 22:25:32 -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
2f9a0d7d9f
Pokecom Center Admin Room -> Office
2018-02-25 22:19:17 -05:00
409fd9d33f
Comment Stadium 2 alternative egg group names
2018-02-25 22:11:32 -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
10173f2a62
Default macro parameters use recursion; avoids repeating internal structure
2018-02-25 20:12:58 -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
cbd423ec08
Format map object attributes like trainer attributes, in preparation for bit flag constants
2018-02-25 16:49:03 -05:00
eb3726bba0
NO_ITEM == 0
2018-02-25 16:48:31 -05:00
e018a9d005
Sprite data values match GetSpriteLength return values and are not limited to multiples of 4
2018-02-25 16:32:40 -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
4046b41c3a
Merge pull request #487 from luckytyphlosion/master
...
Fix more w-izing edge cases.
2018-02-15 21:14:22 -05:00
c3abe8f88b
mapconst H, W -> map_const W, H
...
We've been fixing all of the conventions to be X/Y and W/H, so we should
fix this one as well.
2018-02-14 11:52:01 +01: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
62d6f72bb3
Make tileset palette maps easier to edit
2018-02-09 13:50:20 -05:00
8ddffef8b8
Don't let the Makefile pick up .tilemap files
...
We don't generate any tilemap file with rgbgfx yet, because they won't
match anyway. This should be re-added when we can do it properly.
2018-02-08 19:38:14 +01:00
1d7b1418d5
Remove EXIF metadata from images
...
This is just a pet-peeve of mine, but if you're going to have half of
the repo filled with clean PNGs, and only have some with this metadata,
might as well clean it all right up.
2018-02-08 19:38:14 +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
f8f3294130
Add ROOF_ constants
2018-02-04 21:39:46 -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
ac15415949
Sync _
2018-02-03 22:57:57 -05:00
c959f7a2ea
Labelling, once again.
2018-02-03 22:37:08 -05:00
e668b6cf3a
Merge branch 'master' of github.com:pret/pokecrystal
2018-02-03 22:18:56 -05:00
79849a7e40
db/dw, and keep unused space away from labels
2018-02-03 21:22:06 -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
surskitty