Commit Graph

489 Commits

Author SHA1 Message Date
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
Rangi
53ff57ca66 Correct map constant comments 2018-04-09 18:58:10 -04:00
Rangi
7307fc8dce Use constants for bit/set/res more 2018-04-05 11:44:02 -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
mid-kid
38107209a6 Update docs and comments to reflect renames 2018-04-04 23:44:24 +02:00
Rangi
145efc1353 Use constants for screen size in metatiles 2018-04-04 16:14:48 -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
mid-kid
91a768b243 Update file paths in constants/ and docs/ 2018-04-01 17:01:51 +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
7e9dbde549 HOF_MASTER_COUNT EQU 200 2018-03-04 00:27:22 -05:00
Rangi
bde9ffff6e Improve some code labels 2018-03-02 19:39:16 -05:00
Rangi
5959548c01 Document HOF Master bug (close #494) 2018-02-26 11:51:16 -05:00
Rangi
7453bd1aa8 "HUMANSHAPE, aka Humanshape" 2018-02-25 22:38:09 -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
409fd9d33f Comment Stadium 2 alternative egg group names 2018-02-25 22:11:32 -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
Rangi
60add76ee7 * Remove rept 4 (fa3192e)
* FindGreaterThanThatLevel -> FindAboveLevel (132fe46)
* More meaningful egg group names (0eeb00d)
2018-02-25 19:23:01 -05:00
mid-kid
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
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
mid-kid
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
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
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
b2970e75f4 SCENE_DEFAULT=0 and SCENE_FINISHED=1 (generic constants for a common scene pattern) 2018-02-01 15:06:06 -05:00
Rangi
b54a7b7795 Quick scene explanation 2018-02-01 13:08:30 -05:00
Rangi
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
Rangi
936a170e0d MobileTradeRoom matches MobileBattleRoom 2018-01-31 23:21:15 -05:00
Rangi
a17623d96b Add scene ID constants (TODO: meaningful names) 2018-01-31 23:16:51 -05:00
Rangi
7d6e82ef1c NPC trade constants don't all just start with TRADE_ 2018-01-31 21:16:57 -05:00
Rangi
0eeb00d6ac Official egg group names 2018-01-31 12:03:43 -05:00
Rangi
b8f4b1b8a7 MINERAL egg group works 2018-01-31 11:45:18 -05:00
Rangi
08891da822 const_def N 2018-01-31 11:38:45 -05:00
Rangi
a2607623d3 Comment the person constants sections, like the others 2018-01-31 11:04:17 -05:00
Rangi
a9334f7468 Correct engine flag constants 2018-01-31 10:55:35 -05:00
Rangi
1282405d4a SPRITEMOVEDATA_LAPRAS → SPRITEMOVEDATA_SWIM_WANDER
(more precise, and encourages hacks to add more SWIM movements)
2018-01-30 22:42:41 -05:00
Rangi
006d9f6441 Clarify big doll-related constants (Snorlax and Lapras are symmetrical, Onix is not) 2018-01-30 22:34:05 -05:00
Rangi
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
Rangi
3df4c5ffa8 Group related constants together 2018-01-27 00:17:25 -05:00
Rangi
3332305bb4 Define more bit flag constants 2018-01-26 12:27:02 -05:00
Rangi
f1366d615f Separate map object constants for easier editing 2018-01-26 12:06:33 -05:00
Rangi
662b3459f6 Correct comments 2018-01-25 22:22:25 -05:00
Rangi
6ebe45e41f Move event data to data/events/ 2018-01-25 22:19:24 -05:00
Rangi
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
Rangi
7d3ad2136a Separate home/battle_vars.asm for easy data editing, same as home/hm_moves.asm 2018-01-25 18:10:41 -05:00
Rangi
dcc0ca9b83 Move some more constants out of misc_constants.asm 2018-01-25 17:30:13 -05:00