Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,886 Commits 2 Branches 0 Tags 198 MiB
Commit Graph

297 Commits

Author SHA1 Message Date
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 (132fe46)
* More meaningful egg group names (0eeb00d)
 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
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 a9334f7468 Correct engine flag constants 2018-01-31 10:55:35 -05:00
Rangi 50f6007cc2 No need for ==== lines 2018-01-31 10:36:27 -05:00
Rangi 9ac2cea1f7 Align columns 2018-01-31 00:46:03 -05:00
Rangi 96ae7a7ee3 More compact trainer data 2018-01-31 00:37:03 -05:00
Rangi d260b5f185 Compact trainer data 2018-01-31 00:07:11 -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 6e00101b89 Comment values of special pointers, same as predefs 2018-01-30 14:55:27 -05:00
Rangi 5b678b336c Simpler map connection macro 2018-01-30 14:32:57 -05:00
Rangi 4c4fca1028 Clean up comments 
Base data: types uniquely lacked a comment; items on one line; distinguish unknowns
Dex entries: don't imply that pointers don't exist
 2018-01-29 11:35:50 -05:00
Rangi 84c798e9f4 Clarify TM/HM move/enum correspondence 2018-01-28 01:20:49 -05:00
Rangi e22670438e Badge type boosts make sense in data/types/ 2018-01-28 01:17:32 -05:00
Rangi ea480fa31e Fix off-by-one error 2018-01-26 20:57:55 -05:00
Rangi a0cc4a3392 Move power data belongs in data/moves/ 2018-01-26 11:01:15 -05:00
Rangi 6ebe45e41f Move event data to data/events/ 2018-01-25 22:19:24 -05:00
Rangi 87514598be More battle data in data/battle/ 2018-01-25 21:34:42 -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 518dd46ca1 data/text/X_text.asm is redundant 2018-01-24 21:27:23 -05:00
Rangi 95fd05744d Remove "UnusedSpecial_" prefixes too 2018-01-24 11:20:41 -05:00