Commit Graph

484 Commits

Author SHA1 Message Date
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