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
5,007 Commits 1 Branch 0 Tags 52 MiB
1853f70add
Commit Graph

506 Commits

Author SHA1 Message Date
Rangi
b24cd55f96 Correct the older+younger haircut brothers' labels and constants 2019-05-18 13:27:32 -04:00
DeeDeeG
80e89b5539 PokemonFanClub.asm: Update NPC names 
Includes the following NPC constant renames:

POKEMONFANCLUB_PRESIDENT --> POKEMONFANCLUB_CHAIRMAN
POKEMONFANCLUB_FISHER --> POKEMONFANCLUB_CLEFAIRY_GUY

Also update the Clefairy doll and Bayleef text labels.
 2019-04-28 01:31:58 -04:00
DeeDeeG
3d5467abc8 maps/PokemonFanClub.asm: Re-label UnknownText 2019-04-28 00:59:46 -04:00
DeeDeeG
51e6317164 SaffronMagnetTrainStation.asm: Re-label UnknownText, MovementData 2019-04-28 00:28:49 -04:00
DeeDeeG
099c01be3f GoldenrodPokecenter1F.asm: Re-label UnknownText, MovementData 
Mostly gave non-placeholder labels for the unused GS Ball event.
Also did so for PokeFanF.

Left alone all the unused text about trading and news.
 2019-04-28 00:02:37 -04:00
DeeDeeG
35d64c30d7 GoldenrodMagnetTrainStation.asm: Label UnknownText, MovementData 2019-04-27 22:52:32 -04:00
DeeDeeG
f1187dc860 GoldenrodCity.asm: label UnknownText, MovementData 2019-04-27 22:31:24 -04:00
DeeDeeG
82aea0f71e GoldenrodDeptStore5F.asm: Re-label UnknownText 2019-04-27 21:45:39 -04:00
DeeDeeG
318d042e6c Route35GoldenrodGate.asm: Rename an NPC 
ROUTE35GOLDENRODGATE_OFFICER --> ROUTE35GOLDENRODGATE_RANDY
 2019-04-27 21:45:32 -04:00
DeeDeeG
e47fbb22f2 Route35GoldenrodGate.asm: Re-label UnknownText 2019-04-27 21:44:24 -04:00
DeeDeeG
c6b19dfba2 GoldenrodFlowerShop.asm: Re-label UnknownText 2019-04-27 21:44:24 -04:00
DeeDeeG
f0cd72140a GoldenrodUnderground.asm: Rename some NPCs 
GOLDENRODUNDERGROUND_SUPER_NERD5 --> GOLDENRODUNDERGROUND_OLDER_HAIRCUT_BROTHER
GOLDENRODUNDERGROUND_SUPER_NERD6 --> GOLDENRODUNDERGROUND_YOUNGER_HAIRCUT_BROTHER
 2019-04-27 21:44:24 -04:00
DeeDeeG
a22d70f599 GoldenrodUnderground.asm: Re-label UnknownText 2019-04-27 21:44:24 -04:00
DeeDeeG
8758550960 PowerPlant.asm: Rename some NPCs 
GymGuy3 --> Officer2
POWERPLANT_FISHER --> POWERPLANT_MANAGER
 2019-04-27 21:44:24 -04:00
DeeDeeG
09194683b4 PowerPlant.asm: Re-label UnknownText, MovementData 2019-04-27 21:44:24 -04:00
Rangi
745339014c "object_const_def" instead of "const_def 2" 2019-04-21 17:42:25 -04:00
Rangi
689acb0e36 Try to identify more of maps/unused/Beta*.blk 2019-04-20 14:45:20 -04:00
Rangi
22cc0c25e9
Merge pull request #625 from pret/aus 
Build Australian Crystal.
 2019-04-14 15:30:51 -04:00
IIMarckus
9f7d30439e Build Australian Crystal. 2019-04-14 13:22:45 -06:00
DeeDeeG
31dc62ec5d Adding labels to placeholders (UnknownText, MovementData) in the maps folder (#618) 
Adding labels to placeholders (UnknownText, MovementData) in the maps folder

* KurtsHouse.asm
* RadioTower[1/2/3]F.asm
* Route[35/36]NationalParkGate.asm
 2019-04-13 11:49:42 -04:00
Rangi
f5c9958aea Rename some call/jump script commands to avoid confusion with jr/jp asm instructions 
Fixes #580
 2019-03-10 16:39:31 -04:00
Rangi
e002b536af Rename more script commands for consistency and predictability 
Fixes #540
 2019-03-10 16:00:19 -04:00
Rangi
f9a60cff7a Define constants for prices in maps' event scripts 
Supersedes #592
 2019-02-16 13:19:39 -05:00
mid-kid
0390728d44 Fix constants used with startbattle 2019-01-15 13:37:22 +01:00
Rangi
3202c4f3df Resolve issue #575: Rename text commands 2018-11-18 12:41:11 -05:00
Rangi
3eacab563d
Merge pull request #555 from Rangi42/ldh 
Use real labels for HRAM instead of constants, and the ldh instruction
 2018-08-25 22:23:45 -04:00
Rangi
89681d2316
Merge pull request #541 from igidrau/patch-2 
Labeled everything
 2018-08-25 22:23:25 -04:00
igidrau
f2ac3b96fa
Changed some labels according to Rangi's comments 2018-08-25 21:44:30 +02:00
Rangi
eb1e3636bb Use labels instead of constants for HRAM 
Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
 2018-08-25 14:28:22 -04:00
Rangi
a09cfc0c36 Label some Unknown map text 2018-08-20 20:24:55 -04:00
IIMarckus
cf69876ae5 Better labels/constants for Move Tutor. 2018-08-16 08:05:21 -06:00
igidrau
4aed8ea922
There was an error in the previous commit 2018-08-08 10:56:14 +02:00
igidrau
88a563e6e7
Changed the labels accordingly to the standard style 2018-08-08 10:47:07 +02:00
Rangi
9dec80b07e Add meaningful aliases for wd265 
Introduce MONICON_* constants
Introduce BATTLEPLAYERACTION_* constants
 2018-07-29 00:25:52 -04:00
igidrau
1aa569b329
Changed some label according to Rangi's comment 
I changed things from GitHub, so I hope this still works
 2018-07-12 22:32:11 +02:00
igidrau
5d9cbfec53
Labeled everything 2018-07-12 20:21:55 +02:00
mid-kid
1d9a68dbdd Remove all address comments 2018-06-24 16:13:22 +02:00
Rangi
5c064746f6 Gme → Game 2018-05-21 21:54:56 -04:00
Rangi
d5fff8aa96 Constants for PC menu indexes 
'db  ' -> 'db '
 2018-05-18 22:18:00 -04:00
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
4e4d9c9083 Merge remote-tracking branch 'surskitty/master' into master 2018-03-10 16:10:00 -05:00
surskitty
96dcc3c0ca Labels, labels. 2018-03-07 22:27:35 -05:00
surskitty
55c69c4871 Sprout Tower labels 2018-03-07 22:13:24 -05:00
surskitty
1de25bc957 Labelling Erika and Celadon Gym 2018-03-07 22:05:14 -05:00
surskitty
1494c79688 Labelling Whitney texts 2018-03-02 21:39:29 -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
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
7df5d4f25e Address @SatoMew's comment re: #491 2018-02-26 11:56:49 -05:00
Rangi
711e2d6143 Mention unused Battle Tower-related text (resolves #491) 2018-02-25 22:33:07 -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
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
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
luckytyphlosion
8b007e8d51 Fix more w-izing edge cases. 2018-02-04 22:45:04 -05:00
surskitty
c959f7a2ea Labelling, once again. 2018-02-03 22:37:08 -05:00
surskitty
e668b6cf3a Merge branch 'master' of github.com:pret/pokecrystal 2018-02-03 22:18:56 -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
yenatch
b35eb72290
Merge pull request #480 from luckytyphlosion/master 
[Ready to merge] Prefix wram labels with w.
 2018-02-03 17:15:20 -05:00
Rangi
c834bdadf2 spriteface → objectface, consistent with the other script commands 2018-02-02 21:50:43 -05:00
Rangi
aa8db1632c Remove checkmorn/checkday/checknite macros 2018-02-02 21:20:13 -05:00
Rangi
68d855c213 Script commands don't have underscores 2018-02-02 21:09:17 -05:00
surskitty
2edf131b05 Route 30 Berry Speech House labels 2018-02-02 16:52:15 -05:00
surskitty
955e43c630 Labels, labels, labels 2018-02-02 12:08:43 -05:00
surskitty
1b3a269812 Local jumps, once again. 2018-02-02 11:57:24 -05:00
surskitty
507a8f3535 Ruins of Alph partial labels 2018-02-02 11:57:11 -05:00
surskitty
b37cc569be Radio Card local jumps 2018-02-02 11:30:16 -05:00
surskitty
ddd0b6f958 Jasmine and Amphy labels 2018-02-02 11:13:28 -05:00
surskitty
f1e4951cf1 Sailor Huey labels 2018-02-02 11:02:31 -05:00
surskitty
b94c1f7084 Labelling the Victory Road rival script 2018-02-02 10:57:06 -05:00
surskitty
b53b03eed0 Labelling Buena's subroutines. 2018-02-01 23:39:14 -05:00
Rangi
7a532435bf Missed some SCENE constants 2018-02-01 23:35:28 -05:00
surskitty
ae909428ae Incomplete labelling 2018-02-01 23:30:17 -05:00
Rangi
48f4f2366e Align map event coordinate columns 2018-02-01 22:22:07 -05:00
Rangi
3088a77a21 warp_event x, y, map, warp_id 2018-02-01 21:54:00 -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
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
08891da822 const_def N 2018-01-31 11:38:45 -05:00
Rangi
50a78c0876 Forgot the person→object rename 2018-01-31 11:08:47 -05:00
Rangi
a2607623d3 Comment the person constants sections, like the others 2018-01-31 11:04:17 -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
72cdcb621c Merge branch 'master' of https://github.com/pret/pokecrystal 
# Conflicts:
#	maps/Route25.asm
#	maps/Route27.asm
#	maps/Route35.asm
#	maps/Route39.asm
#	maps/Route42.asm
#	maps/Route43.asm
#	maps/Route43MahoganyGate.asm
#	maps/Route45.asm
#	maps/Route5CleanseTagHouse.asm
#	maps/Route6SaffronGate.asm
#	maps/Route7SaffronGate.asm
#	maps/ViridianCity.asm
 2018-01-30 22:01:20 -05:00
Rangi
6e00101b89 Comment values of special pointers, same as predefs 2018-01-30 14:55:27 -05:00
Rangi
65480605e9 Remove unreferenced map script heading labels 2018-01-30 14:15:47 -05:00
Rangi
477adc72af grep -rl warp_def . | xargs sed -i s/warp_def/warp_event/g 2018-01-28 13:20:04 -05:00
Rangi
518dd46ca1 data/text/X_text.asm is redundant 2018-01-24 21:27:23 -05:00