summaryrefslogtreecommitdiff
path: root/engine/battle
AgeCommit message (Collapse)Author
2018-01-30Fix wVirtualOAM labels, part 2.luckytyphlosion
2018-01-30Fix comment/style issues caused from w-izing.luckytyphlosion
2018-01-23Prefix wram labels with w, part 2.luckytyphlosion
2018-01-23Prefix wram labels with w, part 1.luckytyphlosion
Handle edge cases first.
2018-01-20Scale addresses with PARTY_LENGTHRemy Oukaour
2018-01-20PARTY_LENGTH; MON_NAME; sgb_border.binRemy Oukaour
2018-01-19Japanese characters in Japanese text (e.g. "ォ" not "," for $f4)Remy Oukaour
2018-01-19Use hSerialConnectionStatus constants elsewhereRemy Oukaour
2018-01-19Resolve #471 (although link code still needs more cleanup, like its WRAM labels)Remy Oukaour
2018-01-18Comment on RIVAL1 itemRemy Oukaour
2018-01-16Avoid "+- 1" at every maskbitsRemy Oukaour
2018-01-16Remove Predef_ prefix from routines listed in PredefPointersRemy Oukaour
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-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-13menu_coords macro for (x1, y1, x2, y2) order (see issue #440)Remy Oukaour
2018-01-12More gfx/**/*.pal filesRemy Oukaour
2018-01-11Use maskbits some moreRemy Oukaour
2018-01-10Arrays end with -1, not $ffRemy Oukaour
2018-01-10Battle data goes in data/battle/Remy Oukaour
TreeMons, like fish groups, have constants
2018-01-10Resolve #461Remy Oukaour
2018-01-10map_objects.pal is easier to find in gfx/overworld/ than gfx/sprites/Remy Oukaour
2018-01-09Do a little cleanup towards issue #465Remy Oukaour
2018-01-09Consistent sine wave code formattingRemy Oukaour
2018-01-09More commentsRemy Oukaour
Fix some constants
2018-01-09Move battle engine data into data/Remy Oukaour
IsJohtoGymLeader → IsGymLeader
2018-01-08Document hardcoded SRAM addresses.Adelaide Walter
2018-01-08Use BANK for hardcoded SRAM banks (except for vestigial refs to JP's banks 4-7)Adelaide Walter
2018-01-07Predef_FlagAction -> Predef_SmallFarFlagActionxCrystal
2018-01-05Predef_Flag -> Predef_FlagActionxCrystal
2018-01-04Use BANK for hardcoded WRAM banks preceding FarCopyWRAM/GetFarWRAMByte calls.Adelaide Walter
2018-01-03Use BANK for hardcoded WRAM banks (except where bankswitches appear ↵Adelaide Walter
unnecessary).
2018-01-02Use BANK for all hardcoded banks with BANK in comments.Adelaide Walter
2018-01-02No more mobile EQUS ret (replace with Stubbed_ + ret)xCrystal
2018-01-02More unreferenced labels and unused textxCrystal
2018-01-02Consistent predef function namesxCrystal
2018-01-02More clarificationRemy Oukaour
2018-01-02Reword Magikarp length commentsRemy Oukaour
2018-01-02More unreferenced labels cleanupxCrystal
2018-01-02Clean up Predef function namesxCrystal
2018-01-02Clean up XXX comments for unused contentxCrystal
2018-01-01Merge 2d0ed11 and 355acfc from Roukaour/masterxCrystal
2018-01-01Rename Pals labels in WRAM bank 5xCrystal
2018-01-01Use constants for rBGPI+rOBPI auto-incrementRemy Oukaour
Fix some documentation
2017-12-29LY_BLANK and rLCDC constantsxCrystal
2017-12-28endm -> ENDMxCrystal
2017-12-28Suggest fixes to untranslated magikarp length filtersxCrystal
2017-12-28More constants and documentation in slot machinesxCrystal