Rangi
|
32ed487a47
|
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# audio/engine.asm
# constants/gfx_constants.asm
# constants/map_data_constants.asm
# constants/pokemon_data_constants.asm
# constants/sprite_constants.asm
# constants/wram_constants.asm
# data/maps/data.asm
# engine/battle/ai/scoring.asm
# engine/battle/core.asm
# engine/battle/effect_commands.asm
# engine/battle/misc.asm
# engine/battle_anims/getpokeballwobble.asm
# engine/breeding.asm
# engine/buy_sell_toss.asm
# engine/decorations.asm
# engine/events/battle_tower/battle_tower.asm
# engine/events/battle_tower/rules.asm
# engine/events/buena.asm
# engine/events/bug_contest/contest_2.asm
# engine/events/daycare.asm
# engine/events/dratini.asm
# engine/events/halloffame.asm
# engine/events/happiness_egg.asm
# engine/events/kurt.asm
# engine/events/lucky_number.asm
# engine/events/magnet_train.asm
# engine/events/overworld.asm
# engine/events/pokerus/pokerus.asm
# engine/events/print_unown.asm
# engine/events/print_unown_2.asm
# engine/events/unown_walls.asm
# engine/item_effects.asm
# engine/link.asm
# engine/mon_menu.asm
# engine/player_object.asm
# engine/routines/playslowcry.asm
# engine/scripting.asm
# engine/search.asm
# engine/search2.asm
# engine/specials.asm
# engine/start_menu.asm
# engine/timeset.asm
# home/battle_vars.asm
# home/map.asm
# maps/GoldenrodUndergroundSwitchRoomEntrances.asm
# maps/IlexForest.asm
# maps/KrissHouse2F.asm
# maps/Route39Barn.asm
# mobile/mobile_12_2.asm
# mobile/mobile_40.asm
# mobile/mobile_5f.asm
# wram.asm
|
2018-02-03 19:42:56 -05:00 |
|
Rangi
|
6ff2cb20e6
|
map → map_id; map_def → map; map_data → map_attributes
|
2018-02-03 17:11:55 -05:00 |
|
luckytyphlosion
|
a1951cefc0
|
Prefix wram labels with w, part 2.
|
2018-01-23 17:39:09 -05:00 |
|
Rangi
|
ead103d2c6
|
MenuDataHeader → MenuHeader, MenuData2 → MenuData (might complete issue #440)
|
2018-01-23 16:08:43 -05:00 |
|
Remy Oukaour
|
b071dd364f
|
Japanese characters in Japanese text (e.g. "ォ" not "," for $f4)
|
2018-01-19 21:49:16 -05:00 |
|
Remy Oukaour
|
bf074f3598
|
map_header → map_def; map_header_2 → map_data
|
2018-01-16 23:25:00 -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 |
|
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 |
|
xCrystal
|
aa9a0a900d
|
No more mobile EQUS ret (replace with Stubbed_ + ret)
|
2018-01-02 20:00:14 +01:00 |
|
xCrystal
|
37369d1ae0
|
Rename Pals labels in WRAM bank 5
|
2018-01-01 20:09:53 +01:00 |
|
xCrystal
|
6e12a51503
|
Use more palette(s) constants
|
2018-01-01 20:09:53 +01:00 |
|
xCrystal
|
333524f0be
|
Lowercase v for VRAM addresses
|
2017-12-28 13:32:33 +01:00 |
|
Remy Oukaour
|
040aa7cb17
|
LoadEDTile → CopyTilemapAtOnce (fix #345)
|
2017-12-24 18:11:17 -05:00 |
|
Remy Oukaour
|
c66d195089
|
callba/callab → farcall/callfar
|
2017-12-24 12:47:30 -05:00 |
|
Remy Oukaour
|
ebf3bfb6b2
|
Move some misc/ files into meaningful directories
|
2017-12-15 12:53:33 -05:00 |
|