Rangi
|
e2c15b0b92
|
* BillPhoneGeneriText -> BillPhoneGenericText
* data/phone/text/trainers1.asm -> data/phone/text/trainers.asm
* ,ROM -> , ROM0
|
2018-02-26 22:29:09 -05:00 |
|
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 |
|
Rangi
|
6ebe45e41f
|
Move event data to data/events/
|
2018-01-25 22:19:24 -05:00 |
|
luckytyphlosion
|
a1951cefc0
|
Prefix wram labels with w, part 2.
|
2018-01-23 17:39:09 -05:00 |
|
Rangi
|
363d8b9242
|
KrissHouse → PlayersHouse
|
2018-01-22 19:10:09 -05:00 |
|
Remy Oukaour
|
e69544b61f
|
More Unicode
|
2018-01-19 02:30:19 -05:00 |
|
Remy Oukaour
|
17336221e6
|
newline before para
|
2018-01-18 21:15:59 -05:00 |
|
Remy Oukaour
|
2acaa96cf1
|
More charmap and home/text.asm documentation for JP chars
|
2018-01-18 18:34:20 -05:00 |
|
Remy Oukaour
|
2b82338920
|
Phone data 0/7 are time masks
|
2018-01-15 22:00:56 -05:00 |
|
Remy Oukaour
|
b45f89f80c
|
More constants and data tables
|
2018-01-11 01:45:27 -05:00 |
|
Remy Oukaour
|
feb34b49ba
|
data/phone_text → data/phone/text
|
2018-01-09 19:51:30 -05:00 |