Commit Graph

201 Commits

Author SHA1 Message Date
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
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
i0brendan0
a99adb0e5a Fix
I did a dumb and used the wrong check instruction. Should actually work.
2018-02-20 01:48:22 -06:00
i0brendan0
0e45563497 Add Fix for Lock On Status Moves
These changes should fix the status move and secondary effects not working if the opponent is flying or digging but has been locked on.
2018-02-19 02:54:13 -06:00
Rangi
96c058f0a7 No redundant item effect labels 2018-02-05 13:03:05 -05:00
Rangi
6c405e3859 Keep specials files together 2018-02-04 12:03:31 -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
ac15415949 Sync _ 2018-02-03 22:57:57 -05:00
Rangi
271aa20b73 Keep documentation in sync with new WRAM labels 2018-02-03 20:40:21 -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
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
f5ba69f5e5 Sync documentation with code 2018-01-26 14:36:59 -05:00
Rangi
0cf4eb6895 Move-unique effect commands consistently go in engine/battle/move_effects/ 2018-01-26 11:36:00 -05:00
Rangi
d719d318e8 Remove Special_ prefix from special routines (close #478) 2018-01-24 11:17:05 -05:00
Rangi
0261bd2ff5 Daisy offers "grooming", not "massage" 2018-01-23 00:11:23 -05:00
Remy Oukaour
7f54df58bf Group engine/pokedex files 2018-01-21 18:00:23 -05:00
Remy Oukaour
05382d3e3c PARTY_LENGTH; MON_NAME; sgb_border.bin 2018-01-20 12:25:55 -05:00
Remy Oukaour
2acaa96cf1 More charmap and home/text.asm documentation for JP chars 2018-01-18 18:34:20 -05:00
Remy Oukaour
6d20cf3e80 "CryHeader" → "Cry"; "Cry" → "MonCry" 2018-01-16 23:47:45 -05:00
Remy Oukaour
fe605b2fa7 Document the Magikarp bug fix from PR #443 2017-12-28 14:08:29 -05:00
Remy Oukaour
97dd40284b Document another Magikarp length bug. (to do: correct formula values) 2017-12-28 13:17:43 -05:00
Remy Oukaour
b5ffbfe2af Specify which bugs are needed for backwards compatibility 2017-12-28 12:58:18 -05:00
Remy Oukaour
7167895612 Document another bug
Document fixes for design flaws
GetForestTreeFrame is more like a design flaw than a bug/glitch (though it's really just calling out humorously bad code)
2017-12-28 12:49:32 -05:00
Remy Oukaour
0ceee9696a Explain what bugs, glitches, and flaws are 2017-12-28 11:50:02 -05:00
Remy Oukaour
7a4d641251 Remove redundant data/ filename prefixes 2017-12-27 01:29:15 -05:00
Remy Oukaour
86fd37af16 Move events/ to engine/events/ 2017-12-27 00:09:12 -05:00
Remy Oukaour
47e4f21e62 Keep memory map values in hardware_constants.asm 2017-12-26 23:18:05 -05:00
Remy Oukaour
5d229dcef2 Copy sram.asm's global start/end constants for wram.asm and vram.asm 2017-12-26 23:07:46 -05:00
Remy Oukaour
dae16acd6f event/ → events/, and move some appropriate engine/ files there 2017-12-26 21:55:57 -05:00
Remy Oukaour
b5417fafec Split battle/ into data/ and engine/ components 2017-12-26 17:47:05 -05:00
Remy Oukaour
e34e68095d Resolve #428: Use HIGH(X) and LOW(X) instead of X / $100 and X % $100 or X >> 8 and X & $ff 2017-12-25 14:23:16 -05:00
Remy Oukaour
82a8228e67 Keep images within repo 2017-12-23 12:08:34 -05:00
Remy Oukaour
1ecbfc49f4 Correct directions 2017-12-22 18:01:06 -05:00
Remy Oukaour
ae3bef5596 Document one more graphical mistake 2017-12-22 17:59:50 -05:00
Remy Oukaour
763bd48141 Document a graphical error 2017-12-22 17:52:34 -05:00
Remy Oukaour
ff4d25eee3 Include bugfix in comments 2017-12-21 12:11:35 -05:00
Remy Oukaour
02609940db Document one more bug 2017-12-21 11:43:41 -05:00
Remy Oukaour
2fa1e97aeb Document two more bugs 2017-12-19 19:04:56 -05:00
Remy Oukaour
3ed016f9e0 Auto-label more map scripts 2017-12-17 20:17:30 -05:00
Remy Oukaour
2b6dd505c1 Document another bug
Remove an unused file
2017-12-15 01:01:57 -05:00
Remy Oukaour
28aec67f6e Document one more bug/oversight
Move FleeMons table into data/
2017-12-15 00:05:53 -05:00
Remy Oukaour
9ba224e2e6 Document two more bugs 2017-12-14 21:45:35 -05:00
Remy Oukaour
232feca298 Consistent "(with <routine>) in <file>" phrasing 2017-12-14 19:07:06 -05:00
Remy Oukaour
68785d9996 Use absolute links within repository 2017-12-14 19:04:44 -05:00
Remy Oukaour
c5d482df20 Document two more bugs found by Crystal_ 2017-12-14 16:28:16 -05:00
Remy Oukaour
b17db9b8b5 Friend Ball happiness for boxed Pokémon is not a bug 2017-12-14 14:18:33 -05:00
Remy Oukaour
00f28bb8f4 Consistent **Fix:** notation 2017-12-13 16:52:13 -05:00
Remy Oukaour
feef75c5df Document more bugs and glitches
Add a toc.py script to auto-generate tables of contents in Markdown files
2017-12-13 16:46:31 -05:00
Remy Oukaour
76ea57688e Add table of contents (might remove if it's too cumbersome to maintain) 2017-12-13 00:28:48 -05:00
Remy Oukaour
cd88196b7f Missing close parenthesis 2017-12-12 23:07:35 -05:00
Remy Oukaour
138abd097d Document one more bug. 2017-12-12 23:05:30 -05:00