Remy Oukaour
|
94bbfe2f0c
|
Move map-related "metadata" files into data/maps/
|
2018-01-16 19:56:21 -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 |
|