pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity
4,183 Commits 1 Branch 0 Tags 52 MiB
850ef245f3
Commit Graph

4183 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rangi
7e9dbde549 HOF_MASTER_COUNT EQU 200 2018-03-04 00:27:22 -05:00
surskitty
1494c79688 Labelling Whitney texts 2018-03-02 21:39:29 -05:00
Rangi
bde9ffff6e Improve some code labels 2018-03-02 19:39:16 -05:00
Rangi
fb2ac9e210 Remaining map labels: UnknownText and MovementData 2018-03-01 17:33:43 -05:00
Rangi
2b40a1fb9c Label more map scripts (no more UnknownScripts) 2018-03-01 17:17:08 -05:00
Rangi
ae5a325464 Label more map scripts 2018-03-01 14:20:27 -05:00
Rangi
cad029f936 Label more map scripts 2018-03-01 13:18:51 -05:00
i0brendan0
51bbfee891
Reflect Rangi's suggestion 2018-03-01 04:06:46 -06:00
i0brendan0
82ffb584c8 Add Protect Bug and Fix 
Moves 'miss' when opponent uses Protect.
 2018-03-01 04:08:54 -06:00
Rangi
0680bf99d3 Label more map scripts 2018-02-28 17:47:31 -05:00
Rangi
5a6e43e72a Label more map scripts 2018-02-28 16:50:43 -05:00
Rangi
208ccecd84 "; unused" comments 2018-02-27 19:47:30 -05:00
Rangi
43b5f90457 Replace "Map<MapName>Signpost<#>Script" labels 2018-02-27 19:33:38 -05:00
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
7df5d4f25e Address @SatoMew's comment re: #491 2018-02-26 11:56:49 -05:00
Rangi
5959548c01 Document HOF Master bug (close #494) 2018-02-26 11:51:16 -05:00
i0brendan0
b57bafd3b7 revert 2018-02-26 02:34:25 -06:00
yenatch
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
Rangi
7453bd1aa8 "HUMANSHAPE, aka Humanshape" 2018-02-25 22:38:09 -05:00
Rangi
711e2d6143 Mention unused Battle Tower-related text (resolves #491) 2018-02-25 22:33:07 -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
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
yenatch
f44f306cfd
Merge pull request #477 from mid-kid/master 
Medium-sized cleanups
 2018-02-25 20:12:59 -05:00
Rangi
10173f2a62 Default macro parameters use recursion; avoids repeating internal structure 2018-02-25 20:12:58 -05:00
yenatch
f404af8a43
Merge pull request #486 from surskitty/master 
Another batch of label names
 2018-02-25 20:12:31 -05:00
Rangi
f964d04a87 * loadmenuheader -> loadmenu (ead103d) 
* objectface -> turnobject (c834bda)
 2018-02-25 20:05:37 -05:00
Rangi
be28a0ff4e Meaningful $ff values 2018-02-25 19:50:48 -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
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
a22343d32c Fix TRUE/FALSE constants for CalcMonStats 2018-02-22 18:12:43 +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
Rangi
ff3a43d4b0 Use maskbits NUM_TYPES 2018-02-20 10:54:48 -05: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
612fd7cb96 Merge branch 'master' of https://github.com/pret/pokecrystal 
# Conflicts:
#	maps/KrissHouse2F.asm
 2018-02-15 21:21:58 -05:00
yenatch
4046b41c3a
Merge pull request #487 from luckytyphlosion/master 
Fix more w-izing edge cases.
 2018-02-15 21:14:22 -05: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
mid-kid
23b773d5c2 Label some daycare-related functions 2018-02-14 11:51:47 +01:00
mid-kid
f1c23f2153 Fix use of one constant 2018-02-13 08:36:25 +01:00
mid-kid
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
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
mid-kid
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