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
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
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
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
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
323ef81286
More comments and macros
2018-02-01 15:19:27 -05:00
b2970e75f4
SCENE_DEFAULT=0 and SCENE_FINISHED=1 (generic constants for a common scene pattern)
2018-02-01 15:06:06 -05:00
b54a7b7795
Quick scene explanation
2018-02-01 13:08:30 -05:00
fcfe77bc3d
Meaningful scene constant names
...
(Two common patterns: 0=default event and 1=nothing; and 0=nothing and 1=some event)
2018-02-01 13:03:21 -05:00
936a170e0d
MobileTradeRoom matches MobileBattleRoom
2018-01-31 23:21:15 -05:00
a17623d96b
Add scene ID constants (TODO: meaningful names)
2018-01-31 23:16:51 -05:00
7d6e82ef1c
NPC trade constants don't all just start with TRADE_
2018-01-31 21:16:57 -05:00
0eeb00d6ac
Official egg group names
2018-01-31 12:03:43 -05:00
b8f4b1b8a7
MINERAL egg group works
2018-01-31 11:45:18 -05:00
08891da822
const_def N
2018-01-31 11:38:45 -05:00
a2607623d3
Comment the person constants sections, like the others
2018-01-31 11:04:17 -05:00
a9334f7468
Correct engine flag constants
2018-01-31 10:55:35 -05:00
1282405d4a
SPRITEMOVEDATA_LAPRAS → SPRITEMOVEDATA_SWIM_WANDER
...
(more precise, and encourages hacks to add more SWIM movements)
2018-01-30 22:42:41 -05:00
006d9f6441
Clarify big doll-related constants (Snorlax and Lapras are symmetrical, Onix is not)
2018-01-30 22:34:05 -05:00
cb733954c6
SPRITEMOVEDATA_ITEM_TREE → SPRITEMOVEDATA_STILL (it's used for other things like Azalea's Slowpokes, not just items and trees)
2018-01-30 22:12:53 -05:00
3df4c5ffa8
Group related constants together
2018-01-27 00:17:25 -05:00
3332305bb4
Define more bit flag constants
2018-01-26 12:27:02 -05:00
f1366d615f
Separate map object constants for easier editing
2018-01-26 12:06:33 -05:00
662b3459f6
Correct comments
2018-01-25 22:22:25 -05:00
6ebe45e41f
Move event data to data/events/
2018-01-25 22:19:24 -05:00
d504fb8852
Move AI data tables into data/battle/ai (mirroring engine/battle/ai) so they're more discoverable.
2018-01-25 20:34:33 -05:00
7d3ad2136a
Separate home/battle_vars.asm for easy data editing, same as home/hm_moves.asm
2018-01-25 18:10:41 -05:00
dcc0ca9b83
Move some more constants out of misc_constants.asm
2018-01-25 17:30:13 -05:00
0380c2a493
Move some more constants out of misc_constants.asm
2018-01-25 17:00:31 -05:00
d719d318e8
Remove Special_ prefix from special routines ( close #478 )
2018-01-24 11:17:05 -05:00
505a6595bc
EVENT_TEMPORARY_UNTIL_MAP_RELOAD_[1-8] (close issue #481 )
2018-01-24 10:46:49 -05:00
a1951cefc0
Prefix wram labels with w, part 2.
2018-01-23 17:39:09 -05:00
f2ae74079f
Prefix wram labels with w, part 1.
...
Handle edge cases first.
2018-01-23 16:45:34 -05:00
ead103d2c6
MenuDataHeader → MenuHeader, MenuData2 → MenuData (might complete issue #440 )
2018-01-23 16:08:43 -05:00
517eab6526
"Speech" houses just have dialog NPCs
2018-01-23 12:54:17 -05:00
c5cc23a35f
wGameTimerPause bit flag constants
2018-01-23 12:40:29 -05:00
fdda670f40
Cry headers and map headers were eliminated
2018-01-23 11:17:21 -05:00
94ae404732
Separate data/mon_menu.asm
2018-01-23 10:46:26 -05:00
fc61d58dc4
Rename some more maps
...
The Pokécom Center's .blk contains 1F and the Administration room, but the .asm script is just for the Admin room; 1F-related text and scripts are in GoldenrodPokecenter1F.asm. Presumably both map scripts shared the same .blk.
2018-01-23 01:03:47 -05:00
14cb5a3cb0
EcruteakHouse → EcruteakTinTowerEntrance
2018-01-23 00:30:07 -05:00
0261bd2ff5
Daisy offers "grooming", not "massage"
2018-01-23 00:11:23 -05:00
14ef9d3066
PALETTE_SIZE
2018-01-22 19:57:35 -05:00
a73c532738
tile+color macros in gfx.asm
2018-01-22 19:40:17 -05:00
363d8b9242
KrissHouse → PlayersHouse
2018-01-22 19:10:09 -05:00
7f187be36c
Don't say "House" twice
2018-01-22 18:29:21 -05:00
f44b7ad5c3
Add data/text/
2018-01-22 17:33:52 -05:00
Rangi