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
|
d719d318e8
|
Remove Special_ prefix from special routines (close #478)
|
2018-01-24 11:17:05 -05:00 |
|
luckytyphlosion
|
a1951cefc0
|
Prefix wram labels with w, part 2.
|
2018-01-23 17:39:09 -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
|
ddec0ee305
|
More Japanese characters
|
2018-01-19 20:48:33 -05:00 |
|
Remy Oukaour
|
e69544b61f
|
More Unicode
|
2018-01-19 02:30:19 -05:00 |
|
Remy Oukaour
|
2c7ca13194
|
Disambiguate "%" and "<NO>"
|
2018-01-18 22:30:30 -05:00 |
|
Remy Oukaour
|
105ef872dd
|
Better TX_SOUND_* names
|
2018-01-18 22:06:51 -05:00 |
|
Remy Oukaour
|
17336221e6
|
newline before para
|
2018-01-18 21:15:59 -05:00 |
|
Remy Oukaour
|
747c9059d4
|
Two comments
|
2018-01-18 20:51:38 -05:00 |
|
Remy Oukaour
|
a3beba1e64
|
Use Japanese charmap definitions in strings
|
2018-01-18 20:49:17 -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
|
9180362211
|
Move code out of gfx/ (close #474)
|
2018-01-15 11:06:32 -05:00 |
|
Remy Oukaour
|
0197e6f23c
|
Don't split stats gfx in three
|
2018-01-13 15:22:16 -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
|
6c20ff9e20
|
Reorganize some macros
* tileset data macros go atop their related files, like all the ones in data/
* charmaps are not macros
|
2018-01-07 13:11:29 -05:00 |