summaryrefslogtreecommitdiff
path: root/engine
AgeCommit message (Collapse)Author
2018-01-14Merge branch 'master' of https://github.com/mid-kid/pokecrystal (resolve PR ↵Remy Oukaour
#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-14Merge branch 'dev' of https://github.com/TheMostCuriousThing/pokecrystal ↵Remy Oukaour
(resolve PR #460) # Conflicts: # engine/battle/core.asm # engine/save.asm
2018-01-14Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR ↵Remy Oukaour
#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-14Close #470 (JOHTO_POKEMON)Remy Oukaour
2018-01-14GFX tile sizes in decimalRemy Oukaour
2018-01-14More Battle Tower map script constants, fewer raw hex valuesRemy Oukaour
2018-01-14Use constants for menu flagsmid-kid
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-14Fix some MenuData2 labelsmid-kid
Gave them better names, moved the flags out of the union, and documented the w2DMenuFlags1.
2018-01-13menu_coords macro for (x1, y1, x2, y2) order (see issue #440)Remy Oukaour
2018-01-13Don't split stats gfx in threeRemy Oukaour
2018-01-12Merge branch 'patch' of https://github.com/mid-kid/pokecrystalRemy Oukaour
# Conflicts: # constants/sprite_anim_constants.asm # data/sprite_anims/framesets.asm # data/sprite_anims/oam.asm
2018-01-12More gfx/**/*.pal filesRemy Oukaour
2018-01-12Separate more palettes into gfx/**/*.pal filesRemy Oukaour
2018-01-12Label more ANIM_OBJ_* constantsRemy Oukaour
2018-01-12Label frameset 09mid-kid
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-12Move code out of data/Remy Oukaour
2018-01-12Easier to find palette dataRemy Oukaour
2018-01-12npc_sprites.pal matches PAL_NPC constantsRemy Oukaour
2018-01-12Use more constants in scriptsRemy Oukaour
2018-01-11Break up engine/events_3.asmRemy Oukaour
2018-01-11Local UI tiles don't belong in charmapRemy Oukaour
Separate 1bpp font tiles from gfx/mobile/phone_tiles.png
2018-01-11Use charmap frame charactersRemy Oukaour
2018-01-11Disambiguate some uses of wcf64/5/6Remy Oukaour
2018-01-11Trainer card has state constants and WRAM labelsRemy Oukaour
2018-01-11Use maskbits some moreRemy Oukaour
2018-01-11Move party menu qualities to data/Remy Oukaour
2018-01-11Event script–related constants go in constants/script_constants.asmRemy Oukaour
2018-01-11Group item and deco data moreRemy Oukaour
2018-01-11More constants and data tablesRemy Oukaour
2018-01-11Use constants and data for Unown chamber eventsRemy Oukaour
2018-01-10Arrays end with -1, not $ffRemy Oukaour
2018-01-10Group some mutually edited files in data/sprites/Remy Oukaour
2018-01-10Battle data goes in data/battle/Remy Oukaour
TreeMons, like fish groups, have constants
2018-01-10maskbits <count> +- 1Remy Oukaour
2018-01-10More maskbitsRemy Oukaour
2018-01-10Resolve #461Remy Oukaour
2018-01-10Use maskbits more, and clarify its usageRemy Oukaour
2018-01-10Move radio channel data into data/Remy Oukaour
2018-01-10Constant swap explains this Battle Tower bugRemy Oukaour
2018-01-10gfx/*.asm files have INCBINsRemy Oukaour
2018-01-10map_objects.pal is easier to find in gfx/overworld/ than gfx/sprites/Remy Oukaour
2018-01-09Split tilesets/ into gfx/tilesets and data/tilesets/Remy Oukaour
2018-01-09Move data/palettes/ .pal files into gfx/Remy Oukaour
2018-01-09Binary tilemapsRemy Oukaour
2018-01-09data/phone_text → data/phone/textRemy Oukaour
2018-01-09CRYSTAL11 → _CRYSTAL11Remy Oukaour
2018-01-09Do a little cleanup towards issue #465Remy Oukaour
2018-01-09Clearer Battle Tower codeRemy Oukaour
2018-01-09Consistent sine wave code formattingRemy Oukaour
2018-01-09More commentsRemy Oukaour
Fix some constants