eb8e55a01a
Route 17-18 Gate and Route 29-46 Gate
2018-01-01 18:19:32 -05:00
985946740e
Consistent map naming ("Town" and "City" are left out in houses and gates)
2018-01-01 18:08:18 -05:00
4c35f3ac85
Merge branch 'master' of https://github.com/pret/pokecrystal
...
# Conflicts:
# macros/scripts/maps.asm
2017-12-28 20:56:21 -05:00
50fc9c3389
endm -> ENDM
2017-12-28 22:31:16 +01:00
84e22eb578
Consistent (x, y) coordinate formatting in map scripts
2017-12-28 14:31:25 -05:00
7beb497d3a
Uppercase MACRO and EQU(S) according to the style guide
2017-12-28 13:23:44 +01:00
06857bc222
benny → Benny
2017-12-27 18:45:57 -05:00
2a565f747c
Fix #432 : Bird_keeper → BirdKeeper, Bug_catcher → BugCatcher
2017-12-26 20:42:12 -05:00
35a3a19fda
Use "battle_anims" and "sprite_anims" for clarity, not just "anims"
2017-12-26 18:45:04 -05:00
3165b9e0d3
I'm stopping for the day. Too many silly oversights.
2017-12-25 15:15:32 -05:00
58b3514915
Now all labelled SlowpokeWellB1F.
2017-12-25 15:11:39 -05:00
1a9f190065
Shhh no one saw that.
2017-12-25 15:07:40 -05:00
c13b7af4f5
Disambiguating granddaughter + grandpa #426
2017-12-25 15:06:14 -05:00
79d9f16237
Renaming Slowpoke.
2017-12-25 15:01:50 -05:00
2ab4998a1f
The pokemon is a nidoran, not a growlithe.
2017-12-25 14:35:42 -05:00
1ceacd3cb2
Changing Kimono_girl to KimonoGirl #432
2017-12-25 14:33:57 -05:00
41d4d3d37f
Mt Moon gift shop NPCs are only there in the morning and day.
2017-12-25 14:31:24 -05:00
f22e127bb9
Renaming the Captain #426
2017-12-25 14:27:29 -05:00
5a7dff6554
Ecruteak Dance Theater labels #426
2017-12-25 14:20:27 -05:00
93d6933f10
SS Aqua Captain's cabin #426
2017-12-25 14:01:54 -05:00
d64669c297
Labelling the Itemfinder guy's house. #426
2017-12-25 12:57:20 -05:00
148fd299f9
Add more constants for some maximum values
2017-12-24 19:49:57 -05:00
0a1fef45fd
Rename maps:
...
- Underground -> UndergroundPath
- Route5UndergroundEntrance -> Route5UndergroundPathEntrance
- Route6UndergroundEntrance -> Route6UndergroundPathEntrance
- WarehouseEntrance -> GoldenrodUnderground
- UndergroundWarehouse -> GoldenrodUndergroundWarehouse
- UndergroundPathSwitchRoomEntrances -> GoldenrodUndergroundSwitchRoomEntrances
2017-12-24 18:06:12 -05:00
0b8b6f9259
Use PSYCHIC_M for the Psychic TM.
...
Fixes #385
2017-12-24 17:54:24 -05:00
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
20d6c1d876
Rename "map permissions" to "map environment" ( fix #396 )
2017-12-24 13:08:38 -05:00
2f9f2317a3
Document the meaning of hour and daytime values for person_events
2017-12-23 01:19:34 -05:00
17058aaec2
Auto-label more map scripts
2017-12-17 20:56:35 -05:00
3ed016f9e0
Auto-label more map scripts
2017-12-17 20:17:30 -05:00
e44640b008
Move more main.asm code into individual files
2017-12-15 21:22:26 -05:00
1038ebca5e
Move more contiguous related code blocks from main.asm to engine/ and events/
2017-12-15 20:10:54 -05:00
e48a401290
Reorganize macros
2017-12-14 00:36:24 -05:00
8745915dbd
Rename the Onix trade house to match the rest
2017-12-13 18:07:00 -05:00
047c8e4bc0
xy_trigger handles $0 padding, so map scripts are simpler
2017-12-12 14:11:23 -05:00
4af1d7eca8
Name map groups
2017-12-11 16:50:26 -05:00
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
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
08b14e593e
Rename tilesets, consistent with constant names
2017-12-10 23:56:10 -05:00
a551e345df
PokeCenter → Pokecenter (consistent with the POKECENTER map constants)
2017-12-10 22:34:42 -05:00
a827c02757
Use MORN/DAY/NITE shifts for time-based person_events
2017-12-10 21:00:05 -05:00
b4261d27d8
Use new palette constants
2017-12-10 20:50:08 -05:00
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
66527d861f
"Trainer*AfterBattleText" labels
2017-12-10 15:44:41 -05:00
fba44a5929
Single files for tilesets/data.asm and maps/blockdata.asm
2017-12-10 13:53:02 -05:00
699495bfcb
Consistent capitalization for map names, matching their constants
2017-12-10 13:37:15 -05:00
512863989f
Document constants with comments, actual names, and more thorough usage
2017-12-09 02:15:46 -05:00
cf7eec3bde
Merge pull request #404 from surskitty/master
...
De-Magic-Numbers the Rocket Grunts
2017-12-06 00:06:11 -05:00
15015e4877
Making all Rocket Grunts call the constant.
2017-11-27 00:38:15 -05:00
9c28b822cb
Fighting Dojo npc labels.
2017-11-27 00:07:24 -05:00
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
Remy Oukaour