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 |
|