Remy Oukaour
346a93c00f
Shebang
2018-01-14 23:51:24 -05:00
Remy Oukaour
4d611738c8
Merge branch 'sort-symfile' of https://github.com/yenatch/pokecrystal
2018-01-14 23:47:36 -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
dfcca93b45
Merge branch 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460 )
...
# Conflicts:
# engine/battle/core.asm
# engine/save.asm
2018-01-14 23:00:22 -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
8e1e583640
Close #470 (JOHTO_POKEMON)
2018-01-14 20:58:49 -05:00
Remy Oukaour
7a09fc9f75
GFX tile sizes in decimal
2018-01-14 19:43:35 -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
d38ed29a46
Added menu documentation
...
While slightly shitty, it's as complete as I'm able to get it. Any
improvements are welcome.
2018-01-14 12:08:49 +01: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
mid-kid
066cc91b13
Fix some MenuData2 labels
...
Gave them better names, moved the flags out of the union, and documented
the w2DMenuFlags1.
2018-01-14 11:59:27 +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
0197e6f23c
Don't split stats gfx in three
2018-01-13 15:22:16 -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
d054116458
Merge branch 'patch' of https://github.com/mid-kid/pokecrystal
...
# Conflicts:
# constants/sprite_anim_constants.asm
# data/sprite_anims/framesets.asm
# data/sprite_anims/oam.asm
2018-01-12 17:23:50 -05:00
Remy Oukaour
59c95abf83
Trim whitespace
2018-01-12 17:09:32 -05:00
Remy Oukaour
5a8700c56a
Add missing file
2018-01-12 16:47:42 -05:00
Remy Oukaour
be4510659a
Mystery Gift graphics match
2018-01-12 15:30:46 -05:00
Remy Oukaour
9b19817854
Comments explain colors
2018-01-12 15:26:06 -05:00
Remy Oukaour
bc22bf2627
Egg palette works like other Pokémon
2018-01-12 15:06:25 -05:00
Remy Oukaour
f1e1b26138
More gfx/**/*.pal files
2018-01-12 14:54:00 -05:00
Remy Oukaour
31caeeba3c
Separate more palettes into gfx/**/*.pal files
2018-01-12 14:41:42 -05:00
Remy Oukaour
960783cdf4
Label more ANIM_OBJ_* constants
2018-01-12 13:47:04 -05:00
mid-kid
5b7773b7d3
Label frameset 09
...
It seems to be used as the "big" text entry cursor (i.e. for the bottom
3 buttons in the text entry screen).
It is never referenced explicitly, instead used when adding 1 to
SPRITEANIMSTRUCT_0E, in NamingScreen_AnimateCursor.
2018-01-12 12:17:55 +01:00
Remy Oukaour
0e1148fb2c
Move code out of data/
2018-01-12 03:15:58 -05:00
Remy Oukaour
bdc95598d7
Easier to find palette data
2018-01-12 03:07:48 -05:00
Remy Oukaour
c6a4d35d57
npc_sprites.pal matches PAL_NPC constants
2018-01-12 02:56:14 -05:00
Remy Oukaour
1f5cc28db7
Comment on VAR_* constants
2018-01-12 02:36:14 -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
b23085f526
Missed graphics
2018-01-11 23:51:43 -05:00
Remy Oukaour
af4001132e
Break up engine/events_3.asm
2018-01-11 23:50:44 -05:00
Remy Oukaour
2085ebcc61
maskbits for NUM_FRAMES
2018-01-11 23:04:50 -05:00
Remy Oukaour
163f3e0c3f
Local UI tiles don't belong in charmap
...
Separate 1bpp font tiles from gfx/mobile/phone_tiles.png
2018-01-11 22:49:45 -05:00
Remy Oukaour
177341425c
Use charmap frame characters
2018-01-11 21:14:35 -05:00
Remy Oukaour
17f34cb29c
Disambiguate some uses of wcf64/5/6
2018-01-11 15:36:11 -05:00
Remy Oukaour
fd0a78d708
Trainer card has state constants and WRAM labels
2018-01-11 14:43:18 -05:00
Remy Oukaour
94d6a32721
Use maskbits some more
2018-01-11 14:27:19 -05:00
Remy Oukaour
a436bbc23b
Move party menu qualities to data/
2018-01-11 02:54:07 -05:00
Remy Oukaour
16a39f655a
Full sentences
2018-01-11 02:44:47 -05:00
Remy Oukaour
1a2bc57841
Event script–related constants go in constants/script_constants.asm
2018-01-11 02:35:46 -05:00
Remy Oukaour
68e5a703cb
Resize SGB graphics
2018-01-11 02:10:06 -05:00
Remy Oukaour
2d0506ecf9
Group item and deco data more
2018-01-11 01:54:49 -05:00
Remy Oukaour
b45f89f80c
More constants and data tables
2018-01-11 01:45:27 -05:00
Remy Oukaour
cc8dac5a22
Use constants and data for Unown chamber events
2018-01-11 00:25:14 -05:00
Remy Oukaour
3b7c495e38
No romaji
2018-01-10 23:36:49 -05:00
Remy Oukaour
532724e90f
Comment on the original function of move grammar
2018-01-10 23:29:47 -05:00
Remy Oukaour
0a3b251dcb
Arrays end with -1, not $ff
2018-01-10 22:53:42 -05:00
