Rangi
826e070f04
More syncing with pokegold
2020-11-03 10:13:06 -05:00
Rangi
6d333bed5f
Replace many '; unused' with '; unreferenced'
2020-10-28 10:21:10 -04:00
Rangi
9dcdad5e60
Comment, remove, or revise many unreferenced labels
2020-10-26 20:29:58 -04:00
Rangi
7991db972b
Identify some more link.asm labels (syncing to pokegold)
2020-10-23 13:36:54 -04:00
Rangi
0e3857eac7
Identify unused Route 40 movement data
2020-10-21 16:09:56 -04:00
Rangi
3cd7b9e52e
Consistent (x, y) coordinates for ugdoor macro
2020-10-21 15:39:50 -04:00
Rangi
ff2d850219
Identify some more unnamed labels
2020-10-05 12:02:56 -04:00
Rangi
169470378a
Identify movement labels in map scripts
2020-10-04 18:15:38 -04:00
Rangi
51352aaa4d
Use EGG_LEVEL for Togepi egg
2020-09-27 12:31:39 -04:00
Rangi
dcb24bc724
Use def_* macros for automatic map event counts
...
Resolves #742
2020-07-24 09:57:16 -04:00
Rangi
59d9932255
SPRITE_GYM_GUY -> SPRITE_GYM_GUIDE
2020-07-17 13:01:48 -04:00
Rangi
ef452ccbc7
return → endcallback, reloadandreturn → reloadend
2020-07-17 08:37:03 -04:00
Rangi
c086de0c98
Use const_skip and const_next macros for brevity
2020-07-10 20:03:46 -04:00
Rangi
73d20afd15
Use pokepret account for committing to symbols branch
2020-06-22 17:25:42 -04:00
Rangi
61847b3596
Identify some more labels
2020-06-22 16:30:13 -04:00
Rangi
91774f206e
Replace "Unreferenced" labels with "; unreferenced" comments
2020-06-21 16:27:43 -04:00
Rangi
ac0025064f
Identify some more Unknown labels
2020-06-20 18:52:26 -04:00
Rangi
f2550fc3c2
ReplaceKrisSprite -> UpdatePlayerSprite
2020-06-16 19:38:00 -04:00
Rangi
7b2515d1e4
[in progress] Harmonize more constant and data files with pokegold
2020-06-16 14:32:57 -04:00
Rangi
b9f2b93c17
Harmonize some more symbols with pokegold
2020-06-16 11:28:52 -04:00
Rangi
401aa383e2
make DEBUG=1 logs all symbols in the .map and .sym files
2020-06-14 21:52:33 -04:00
Rangi
75035a71a5
Label some mobile addresses, and revise some comments
2020-06-13 18:48:26 -04:00
Rangi
518cee440e
Resolve #723 : treat std scripts like specials and predefs
2020-06-10 16:44:16 -04:00
Rangi
b69526a908
Miscellaneous fixes
...
Addresses the haircut brothers' probability comments in #709
2020-05-05 10:17:02 -04:00
Rangi
58b377f25b
Fix #709 miscellaneous issues
2020-04-16 09:30:50 -04:00
Rangi
0345e4fb0e
Add suffixes to some constants to avoid ambiguity
...
- `PSYCHIC` → `PSYCHIC_TYPE` (not the trainer `PSYCHIC_T` or the move `PSYCHIC_M`)
- `BLACKBELT` → `BLACKBELT_I` (not the trainer `BLACKBELT_T`)
- `CURSE_T` → `CURSE_TYPE` (not the move `CURSE`)
- `TOWN_MAP_D` → `TOWN_MAP_POSTER` (not the item `TOWN_MAP`)
This also uncovered a misidentified event: `EVENT_DECO_PLANT_4` → `EVENT_DECO_POSTER_1`. (There are three plants and four posters.)
2020-03-21 17:59:26 -04:00
mid-kid
317188b35f
Correct fash ship typos
2020-02-16 12:22:13 +01:00
mid-kid
d00167d6b8
Make all decorations use consistent names
...
If we're not going to prefix the decos, don't prefix any of them.
2019-11-18 18:21:08 +01:00
Rangi
9ebe549347
Merge pull request #654 from Rangi42/master
...
Miscellaneous cleanup issues
2019-11-04 19:40:58 -05:00
Rangi
fbe2494dc2
Miscellaneous label and comment corrections
2019-11-03 14:47:06 -05:00
Rangi
4aeab6b879
Rename buttonsound to promptbutton
2019-11-03 12:48:54 -05:00
DeeDeeG
3234cb1117
VioletPokecenter1F.asm: Rename an NPC constant
...
"VIOLETPOKECENTER1F_SCIENTIST" --> "VIOLETPOKECENTER1F_ELMS_AIDE"
2019-10-20 22:15:52 -04:00
DeeDeeG
b907eeeab0
MountMortarB1F.asm: Rename an NPC constant
...
"MOUNTMORTARB1F_BLACK_BELT" --> "MOUNTMORTARB1F_KIYO"
2019-10-20 22:15:39 -04:00
DeeDeeG
b10aa879e9
MahoganyMart1F.asm: Rename an NPC constant
...
"MAHOGANYMART1F_DRAGON" --> "MAHOGANYMART1F_DRAGONITE"
2019-10-20 22:14:25 -04:00
DeeDeeG
4feaa5afbd
MahoganyMart1F.asm: Typo: "Mahogay" --> "Mahogany"
2019-10-20 22:14:20 -04:00
DeeDeeG
5c2165592c
MahoganyMart1F.asm: Rename MovementData
2019-10-20 22:14:09 -04:00
DeeDeeG
7708f924f2
LakeOfRage.asm: Rename MovementData
2019-10-20 22:14:01 -04:00
mid-kid
e3e0bcd653
#641 fixes and additions. ( #646 )
...
Name a lot of text labels according to our conventions
2019-10-20 18:24:17 -04:00
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