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
Rangi
d719d318e8
Remove Special_ prefix from special routines ( close #478 )
2018-01-24 11:17:05 -05:00
Rangi
132fe46925
Rename some routines to avoid conflicts when removing "Special_" prefixes
2018-01-24 11:12:02 -05:00
Rangi
505a6595bc
EVENT_TEMPORARY_UNTIL_MAP_RELOAD_[1-8] (close issue #481 )
2018-01-24 10:46:49 -05:00
surskitty
8874ec7252
Completing labels for Route 35.
2018-01-23 23:49:50 -05:00
surskitty
b25e5626a1
Renaming the UnknownScript for reloading the map after battle.
2018-01-23 23:49:15 -05:00
surskitty
076e604387
Labelling some more UnknownScripts. These files remain incomplete.
2018-01-23 23:40:25 -05:00
luckytyphlosion
a1951cefc0
Prefix wram labels with w, part 2.
2018-01-23 17:39:09 -05:00
luckytyphlosion
f2ae74079f
Prefix wram labels with w, part 1.
...
Handle edge cases first.
2018-01-23 16:45:34 -05:00
Rangi
ead103d2c6
MenuDataHeader → MenuHeader, MenuData2 → MenuData (might complete issue #440 )
2018-01-23 16:08:43 -05:00
Rangi
8f2878c37e
trainers put the class and id first: trainer YOUNGSTER, JOEY1, ...
2018-01-23 13:08:48 -05:00
Rangi
dea26c6639
hiddenitem, like itemball and object_event, puts the item first and the event last
2018-01-23 12:59:21 -05:00
Rangi
b88928e9aa
Missed a file
2018-01-23 12:55:02 -05:00
Rangi
517eab6526
"Speech" houses just have dialog NPCs
2018-01-23 12:54:17 -05:00
Rangi
fc61d58dc4
Rename some more maps
...
The Pokécom Center's .blk contains 1F and the Administration room, but the .asm script is just for the Admin room; 1F-related text and scripts are in GoldenrodPokecenter1F.asm. Presumably both map scripts shared the same .blk.
2018-01-23 01:03:47 -05:00
Rangi
14cb5a3cb0
EcruteakHouse → EcruteakTinTowerEntrance
2018-01-23 00:30:07 -05:00
Rangi
0261bd2ff5
Daisy offers "grooming", not "massage"
2018-01-23 00:11:23 -05:00
surskitty
fbc6fe4722
Merge branch 'master' of github.com:pret/pokecrystal
2018-01-23 00:02:56 -05:00
Rangi
363d8b9242
KrissHouse → PlayersHouse
2018-01-22 19:10:09 -05:00
Rangi
7f187be36c
Don't say "House" twice
2018-01-22 18:29:21 -05:00
Rangi
f44b7ad5c3
Add data/text/
2018-01-22 17:33:52 -05:00
Rangi
efe6981a0d
Add daily+weekly bit flags (close issue #429 )
2018-01-22 15:59:24 -05:00
Rangi
3a7f518de4
wStatusFlags/2 bit constants
2018-01-22 15:40:43 -05:00
Rangi
4d8528f903
More engine flag constants
2018-01-22 14:34:55 -05:00
Rangi
7cef012335
wUnlockedUnowns engine flag constants
...
Use local labels for "End"ings
2018-01-22 13:00:35 -05:00
Remy Oukaour
05382d3e3c
PARTY_LENGTH; MON_NAME; sgb_border.bin
2018-01-20 12:25:55 -05:00
Remy Oukaour
8127d1fbcf
Rename BATTLETOWER_NROF constants
2018-01-20 12:05:16 -05:00
Remy Oukaour
b071dd364f
Japanese characters in Japanese text (e.g. "ォ" not "," for $f4)
2018-01-19 21:49:16 -05:00
Remy Oukaour
e69544b61f
More Unicode
2018-01-19 02:30:19 -05:00
Remy Oukaour
a3beba1e64
Use Japanese charmap definitions in strings
2018-01-18 20:49:17 -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
c70e8eec49
Comment on changeblock ids
2018-01-17 13:23:43 -05:00
Remy Oukaour
bf074f3598
map_header → map_def; map_header_2 → map_data
2018-01-16 23:25:00 -05:00
Remy Oukaour
94bbfe2f0c
Move map-related "metadata" files into data/maps/
2018-01-16 19:56:21 -05:00
surskitty
4162705db9
Cooltrainerm Kevin
2018-01-16 13:35:33 -05:00
surskitty
fb02e4bde5
Birdkeeper Jose and Cooltrainerf Reena
2018-01-16 13:26:13 -05:00
surskitty
d588033748
Route 35 local labels
2018-01-15 23:30:39 -05:00
surskitty
115a5c236d
Changing labels to local.
2018-01-15 23:23:04 -05:00
surskitty
c167c81611
Fisherman Tully labels
2018-01-15 23:09:56 -05:00
surskitty
9ce97c82d4
Route 43 labels
2018-01-15 23:02:39 -05:00
surskitty
3734a43062
Route 45 labels
2018-01-15 22:52:19 -05:00
surskitty
f14d0d8f21
Route 26 labels
2018-01-15 22:25:11 -05:00
surskitty
40952508c2
Renaming again
2018-01-15 22:19:17 -05:00
surskitty
d837c7609a
Labelling Route 46's wrappers.
2018-01-15 22:02:01 -05:00
surskitty
2548f75feb
Disambiguating the wrapper functions.
2018-01-15 21:59:48 -05:00
surskitty
d53881a0d4
Picnicker Erin labels
2018-01-15 21:39:07 -05:00
surskitty
e8d651b79a
Saffron City guard labels
2018-01-15 21:32:31 -05:00
surskitty
3e0cac29e3
Route 5 Cleanse Tag granny labels
2018-01-15 21:28:42 -05:00
surskitty
b098816b46
Labelling Route 44; Birdkeeper Vance and Fisher Wilton.
2018-01-15 21:23:32 -05:00
surskitty
1aae9eb528
Labelling simple local jumps.
2018-01-15 21:14:48 -05:00
Remy Oukaour
fe3ef73a8c
Group unused data
2018-01-15 00:44:40 -05:00
Remy Oukaour
14c8cf5b48
Merge branch 'master' of https://github.com/mid-kid/pokecrystal (resolve PR #452 )
...
# Conflicts:
# data/player_names.asm
# engine/battle/menu.asm
# engine/billspc.asm
# engine/billspctop.asm
# engine/buy_sell_toss.asm
# engine/decorations.asm
# engine/delete_save_change_clock.asm
# engine/events/buena.asm
# engine/events/elevator.asm
# engine/events/kurt.asm
# engine/events/mom.asm
# engine/events/move_tutor.asm
# engine/events/pokecenter_pc.asm
# engine/events/pokepic.asm
# engine/events/std_scripts.asm
# engine/events/unown_walls.asm
# engine/init_gender.asm
# engine/intro_menu.asm
# engine/mail.asm
# engine/main_menu.asm
# engine/mart.asm
# engine/menu_2.asm
# engine/mon_menu.asm
# engine/pack.asm
# engine/slot_machine.asm
# engine/start_menu.asm
# home/menu.asm
# maps/CeladonDeptStore6F.asm
# maps/CeladonGameCornerPrizeRoom.asm
# maps/DragonShrine.asm
# maps/EarlsPokemonAcademy.asm
# maps/GoldenrodCity.asm
# maps/GoldenrodDeptStore6F.asm
# maps/GoldenrodGameCorner.asm
# maps/GoldenrodPokeComCenter2FMobile.asm
# mobile/mobile_12.asm
# mobile/mobile_12_2.asm
# mobile/mobile_22.asm
# mobile/mobile_22_2.asm
# mobile/mobile_40.asm
# mobile/mobile_45.asm
# mobile/mobile_45_sprite_engine.asm
# mobile/mobile_46.asm
# mobile/mobile_5c.asm
# mobile/mobile_5f.asm
# mobile/mobile_menu.asm
2018-01-14 23:43:51 -05:00
Remy Oukaour
5c28d05bb4
Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459 )
...
# Conflicts:
# data/items/descriptions.asm
# data/sprite_anims/framesets.asm
# engine/crystal_colors.asm
# engine/events/kurt.asm
# engine/events/special.asm
# engine/events/std_scripts.asm
# engine/events_3.asm
# engine/item_effects.asm
# engine/namingscreen.asm
# engine/scripting.asm
# engine/stats_screen.asm
# engine/trade_animation.asm
# home/audio.asm
# main.asm
# maps/BattleTower1F.asm
# maps/BattleTowerBattleRoom.asm
# maps/BurnedTowerB1F.asm
# maps/ElmsLab.asm
# maps/GoldenrodDeptStore5F.asm
# maps/GoldenrodUnderground.asm
# maps/HallOfFame.asm
# maps/MahoganyTown.asm
# maps/ManiasHouse.asm
# maps/MobileBattleRoom.asm
# maps/MobileTradeRoomMobile.asm
# maps/RadioTower2F.asm
# maps/Route35NationalParkGate.asm
# maps/Route36NationalParkGate.asm
# maps/Route39Farmhouse.asm
# tilesets/palette_maps.asm
2018-01-14 22:56:36 -05:00
Remy Oukaour
eb3102200f
More Battle Tower map script constants, fewer raw hex values
2018-01-14 19:26:55 -05:00
mid-kid
11d67567d2
Use constants for menu flags
...
Added a bunch of constants for the bitflags of each kind of menu. Some
are slightly vague or too long, but I'm not sure how to else name them.
2018-01-14 11:59:56 +01:00
Remy Oukaour
2ab60fa8a4
menu_coords macro for (x1, y1, x2, y2) order (see issue #440 )
2018-01-13 16:38:14 -05:00
Remy Oukaour
3db107b721
Label Dragon Shrine
2018-01-13 10:25:02 -05:00
Remy Oukaour
b28e71271d
Consistent stonetable cmdqueues
2018-01-13 01:03:42 -05:00
Remy Oukaour
5a3822fe86
Introduce callback, hiddenitem, conditional_event, and cmdqueue macros for map scripts
2018-01-13 00:47:38 -05:00
Remy Oukaour
59c95abf83
Trim whitespace
2018-01-12 17:09:32 -05:00
Remy Oukaour
2b4a4ccaab
SaffronMagnetTrainStation
2018-01-12 02:33:06 -05:00
Remy Oukaour
d83aefb30a
Use more constants in scripts
2018-01-12 02:27:42 -05:00
Remy Oukaour
cc8dac5a22
Use constants and data for Unown chamber events
2018-01-11 00:25:14 -05:00
Remy Oukaour
0a3b251dcb
Arrays end with -1, not $ff
2018-01-10 22:53:42 -05:00
Remy Oukaour
2f0973f3e0
Clean up some hex values in map scripts
2018-01-09 18:45:25 -05:00
Remy Oukaour
31edd7f803
Move text/ into data/
2018-01-09 00:23:48 -05:00
xCrystal
91f97f08f0
Special_MapCallbackSprites_LoadUsedSpritesGFX -> Special_LoadUsedSpritesGFX
2018-01-03 14:58:08 +01:00
xCrystal
aa9a0a900d
No more mobile EQUS ret (replace with Stubbed_ + ret)
2018-01-02 20:00:14 +01:00
xCrystal
b4e087167f
More unreferenced labels and unused text
2018-01-02 19:38:56 +01:00
xCrystal
d7970f749a
Consistent predef function names
2018-01-02 18:49:25 +01:00
xCrystal
b4a49351c1
Finish consistent Special function names
2018-01-02 17:47:58 +01:00
xCrystal
f1ea15bbfe
Consolidate Special function names
2018-01-02 17:13:57 +01:00
xCrystal
6f0b81504d
More unreferenced labels cleanup
2018-01-02 16:04:21 +01:00
Remy Oukaour
eb8e55a01a
Route 17-18 Gate and Route 29-46 Gate
2018-01-01 18:19:32 -05:00
Remy Oukaour
985946740e
Consistent map naming ("Town" and "City" are left out in houses and gates)
2018-01-01 18:08:18 -05:00
Remy Oukaour
4c35f3ac85
Merge branch 'master' of https://github.com/pret/pokecrystal
...
# Conflicts:
# macros/scripts/maps.asm
2017-12-28 20:56:21 -05:00
xCrystal
50fc9c3389
endm -> ENDM
2017-12-28 22:31:16 +01:00
Remy Oukaour
84e22eb578
Consistent (x, y) coordinate formatting in map scripts
2017-12-28 14:31:25 -05:00
xCrystal
7beb497d3a
Uppercase MACRO and EQU(S) according to the style guide
2017-12-28 13:23:44 +01:00
Remy Oukaour
06857bc222
benny → Benny
2017-12-27 18:45:57 -05:00
Remy Oukaour
2a565f747c
Fix #432 : Bird_keeper → BirdKeeper, Bug_catcher → BugCatcher
2017-12-26 20:42:12 -05:00
Remy Oukaour
35a3a19fda
Use "battle_anims" and "sprite_anims" for clarity, not just "anims"
2017-12-26 18:45:04 -05:00
surskitty
3165b9e0d3
I'm stopping for the day. Too many silly oversights.
2017-12-25 15:15:32 -05:00
surskitty
58b3514915
Now all labelled SlowpokeWellB1F.
2017-12-25 15:11:39 -05:00
surskitty
1a9f190065
Shhh no one saw that.
2017-12-25 15:07:40 -05:00
surskitty
c13b7af4f5
Disambiguating granddaughter + grandpa #426
2017-12-25 15:06:14 -05:00
surskitty
79d9f16237
Renaming Slowpoke.
2017-12-25 15:01:50 -05:00
surskitty
2ab4998a1f
The pokemon is a nidoran, not a growlithe.
2017-12-25 14:35:42 -05:00
surskitty
1ceacd3cb2
Changing Kimono_girl to KimonoGirl #432
2017-12-25 14:33:57 -05:00
surskitty
41d4d3d37f
Mt Moon gift shop NPCs are only there in the morning and day.
2017-12-25 14:31:24 -05:00
surskitty
f22e127bb9
Renaming the Captain #426
2017-12-25 14:27:29 -05:00
surskitty
5a7dff6554
Ecruteak Dance Theater labels #426
2017-12-25 14:20:27 -05:00
surskitty
93d6933f10
SS Aqua Captain's cabin #426
2017-12-25 14:01:54 -05:00
surskitty
d64669c297
Labelling the Itemfinder guy's house. #426
2017-12-25 12:57:20 -05:00
Remy Oukaour
148fd299f9
Add more constants for some maximum values
2017-12-24 19:49:57 -05:00
Remy Oukaour
0a1fef45fd
Rename maps:
...
- Underground -> UndergroundPath
- Route5UndergroundEntrance -> Route5UndergroundPathEntrance
- Route6UndergroundEntrance -> Route6UndergroundPathEntrance
- WarehouseEntrance -> GoldenrodUnderground
- UndergroundWarehouse -> GoldenrodUndergroundWarehouse
- UndergroundPathSwitchRoomEntrances -> GoldenrodUndergroundSwitchRoomEntrances
2017-12-24 18:06:12 -05:00
yenatch
0b8b6f9259
Use PSYCHIC_M for the Psychic TM.
...
Fixes #385
2017-12-24 17:54:24 -05:00
Remy Oukaour
c05b7f41dd
Renaming: ( fix #412 )
...
- MapTriggers / maptrigger → SceneScripts / scene_script
- XYTriggers / xy_trigger → CoordEvents / coord_event
- Signposts / signpost → BGEvents / bg_event
- PersonEvents / person_event → ObjectEvents / object_event
2017-12-24 14:33:17 -05:00
Remy Oukaour
20d6c1d876
Rename "map permissions" to "map environment" ( fix #396 )
2017-12-24 13:08:38 -05:00
Remy Oukaour
2f9f2317a3
Document the meaning of hour and daytime values for person_events
2017-12-23 01:19:34 -05:00
Remy Oukaour
17058aaec2
Auto-label more map scripts
2017-12-17 20:56:35 -05:00
Remy Oukaour
3ed016f9e0
Auto-label more map scripts
2017-12-17 20:17:30 -05:00
Remy Oukaour
e44640b008
Move more main.asm code into individual files
2017-12-15 21:22:26 -05:00
Remy Oukaour
1038ebca5e
Move more contiguous related code blocks from main.asm to engine/ and events/
2017-12-15 20:10:54 -05:00
Remy Oukaour
e48a401290
Reorganize macros
2017-12-14 00:36:24 -05:00
Remy Oukaour
8745915dbd
Rename the Onix trade house to match the rest
2017-12-13 18:07:00 -05:00
Remy Oukaour
047c8e4bc0
xy_trigger handles $0 padding, so map scripts are simpler
2017-12-12 14:11:23 -05:00
Remy Oukaour
4af1d7eca8
Name map groups
2017-12-11 16:50:26 -05:00
Remy Oukaour
31cce83e9b
Move lots of data tables into individual data/ files
...
(This is not expected to be their final location, but it makes them easier to relocate when necessary, and easier for users to edit until the whole project's file structure is finalized.)
2017-12-11 14:23:18 -05:00
Remy Oukaour
41acb0667a
Document macros/map.asm
...
Rename MORN/DAY/NITE to MORN_F/DAY_F/NITE_F; use MORN/DAY/NITE for shifted values (cleaner for person_events)
Prefix FLOOR to the `elevfloor` constants
2017-12-11 01:02:28 -05:00
Remy Oukaour
08b14e593e
Rename tilesets, consistent with constant names
2017-12-10 23:56:10 -05:00
Remy Oukaour
a551e345df
PokeCenter → Pokecenter (consistent with the POKECENTER map constants)
2017-12-10 22:34:42 -05:00
Remy Oukaour
a827c02757
Use MORN/DAY/NITE shifts for time-based person_events
2017-12-10 21:00:05 -05:00
Remy Oukaour
b4261d27d8
Use new palette constants
2017-12-10 20:50:08 -05:00
Remy Oukaour
62f5913943
All map triggers use the maptrigger macro, not dw
...
.MapTriggers and .MapCallbacks lists are formatted consistently with .Warps, .XYTriggers, .Signposts, and .PersonEvents
2017-12-10 17:53:21 -05:00
Remy Oukaour
66527d861f
"Trainer*AfterBattleText" labels
2017-12-10 15:44:41 -05:00
Remy Oukaour
fba44a5929
Single files for tilesets/data.asm and maps/blockdata.asm
2017-12-10 13:53:02 -05:00
Remy Oukaour
699495bfcb
Consistent capitalization for map names, matching their constants
2017-12-10 13:37:15 -05:00
Remy Oukaour
512863989f
Document constants with comments, actual names, and more thorough usage
2017-12-09 02:15:46 -05:00
yenatch
cf7eec3bde
Merge pull request #404 from surskitty/master
...
De-Magic-Numbers the Rocket Grunts
2017-12-06 00:06:11 -05:00
surskitty
15015e4877
Making all Rocket Grunts call the constant.
2017-11-27 00:38:15 -05:00
surskitty
9c28b822cb
Fighting Dojo npc labels.
2017-11-27 00:07:24 -05:00
mid-kid
09d9f2c1ef
Add MobileError-related labels
...
This function is called from a few different places in the mobile code,
including from one special that is only executed when the
BattleTowerRoomMenu special returns with a non-zero code.
Since that special causes a blue "error" screen to appear, that looks
the exact same as the one you'd get when trying to connect from the
mobile trade corner/battle colosseum in a Pokémon Center's top floor,
and this function contains a bunch of japanese strings in a jumptable, I
think it's reasonable to assume it should be called
"DisplayMobileError".
2017-11-26 11:35:13 +01:00
mid-kid
89d6a24644
Script_ChoseChallenge -> Script_ChooseChallenge
...
This script is called for the player to *choose* (or pick) the challenge
they want to undertake.
2017-11-26 11:29:38 +01:00
mid-kid
afc92eadc1
Label BattleTowerRoomMenu
...
All of the functions called by it are prefixed with BattleTowerRoomMenu,
but a bunch of them seem more generic than that, since they're part of
different mobile menus. Also called another menu jumptable
BattleTowerRoomMenu2 for the lack of a better name (only the Yes/No menu
functions are used in western crystal).
The names of the more generic functions should be fixed when we start
labelling other menus.
2017-11-25 17:03:20 +01:00
Marcus Huderle
c28be02a19
Merge pull request #395 from surskitty/master
...
Some Script Labels
2017-11-21 17:18:29 -08:00
mid-kid
e5f9fddb86
PewterPokeCEnter2FBeta -> PewterPokeCenter2FBeta
...
Probably a typo.
2017-11-22 00:34:37 +01:00
mid-kid
671341a0fb
Labelled some battle tower-related functions
...
The UbersCheck and LevelCheck are used only for the battle tower,
despite them living in the mobile files.
Also labelled some of the known BattleTowerActions.
2017-11-19 11:52:42 +01:00
surskitty
88a80619d2
Cianwood City labels
2017-10-26 20:25:36 -04:00
surskitty
3caa8d1cbc
Another label.
2017-10-26 19:53:20 -04:00
surskitty
0852c9ad38
Pokefan Derek fully labelled.
2017-10-26 19:48:13 -04:00
surskitty
9f46f07e72
Full script labels for Fuchsia Gym.
2017-10-26 19:38:58 -04:00
surskitty
98c7050563
Cerulean Mart labels
2017-10-26 19:21:42 -04:00
surskitty
394c9f2c24
Partially labelling Pokefan Derek.
2017-10-26 02:26:47 -04:00
surskitty
63287e5648
Some Fuchsia Gym labels.
2017-10-26 02:14:05 -04:00
surskitty
2d185c697d
Fuchsia City labels
2017-10-26 02:03:55 -04:00
surskitty
ba0424d79c
Celadon Cafe labels.
2017-10-26 01:59:28 -04:00
surskitty
151174300f
Labelling triggers pointlessly.
2017-10-26 01:51:13 -04:00
surskitty
14a121f85e
Mahogany Gym labels.
2017-10-26 01:23:54 -04:00
