yenatch dff0cdeb5a Merge remote-tracking branch 'YamaArashi/master' ...

Conflicts:
	constants/misc_constants.asm
	engine/battle/core.asm
	engine/menu/pokedex.asm
	engine/town_map.asm
	home.asm
	hram.asm

2014-09-20 00:57:27 -04:00

..

battle

Merge remote-tracking branch 'YamaArashi/master'

2014-09-20 00:57:27 -04:00

items

Merge remote-tracking branch 'YamaArashi/master'

2014-09-20 00:57:27 -04:00

menu

Merge remote-tracking branch 'YamaArashi/master'

2014-09-20 00:57:27 -04:00

overworld

Commented/labelled misc functions

2014-09-14 11:29:18 -07:00

cable_club.asm

Merge remote-tracking branch 'YamaArashi/master'

2014-09-20 00:57:27 -04:00

clear_save.asm

Use *Coord instead of FuncCoord

2014-06-25 16:58:27 -04:00

evolution.asm

Merge remote-tracking branch 'YamaArashi/master'

2014-09-20 00:57:27 -04:00

evolve_trade.asm

Labelled and commented mostly sprite-related things

2014-09-09 20:55:19 -07:00

evos_moves.asm

Merge remote-tracking branch 'YamaArashi/master'

2014-09-20 00:57:27 -04:00

experience.asm

Labelled many functions/variables

2014-08-08 22:39:13 -07:00

game_corner_slots2.asm

Use macros for predef calls/jumps instead of static ids.

2014-06-16 13:57:26 -07:00

game_corner_slots.asm

Remove most static wram addresses. Use labels instead.

2014-05-26 22:04:39 -07:00

gamefreak.asm

Use VRAM constants where applicable.

2014-05-29 01:31:46 -07:00

give_pokemon.asm

Merge remote-tracking branch 'YamaArashi/master'

2014-09-20 00:57:27 -04:00

hall_of_fame.asm

Commented/labelled misc functions

2014-09-14 11:29:18 -07:00

hidden_object_functions3.asm

Commented/labelled misc functions

2014-09-14 11:29:18 -07:00

hidden_object_functions7.asm

Commented/labelled misc functions

2014-09-14 11:29:18 -07:00

hidden_object_functions14.asm

Commented more sprite and map code

2014-09-13 00:50:56 -07:00

hidden_object_functions17.asm

Commented more sprite and map code

2014-09-13 00:50:56 -07:00

hidden_object_functions18.asm

Commented/labelled misc functions

2014-09-14 11:29:18 -07:00

HoF_room_pc.asm

Labelled many functions/variables

2014-08-08 22:39:13 -07:00

hp_bar.asm

Use macros to define predefs.

2014-06-16 13:25:46 -07:00

in_game_trades.asm

Commented/labelled misc functions

2014-09-14 11:29:18 -07:00

intro.asm

Commented more sprite and map code

2014-09-13 00:50:56 -07:00

joypad.asm

Split out joypad code from main.asm.

2014-05-31 12:25:40 -07:00

learn_move.asm

Use *Coord instead of FuncCoord

2014-06-25 16:58:27 -04:00

load_pokedex_tiles.asm

Use VRAM constants where applicable.

2014-05-29 01:31:46 -07:00

mon_party_sprites.asm

Commented more sprite and map code

2014-09-13 00:50:56 -07:00

multiply_divide.asm

Pull a lot of engine out of main.asm

2014-05-22 18:13:20 -04:00

oak_speech2.asm

Use *Coord instead of FuncCoord

2014-06-25 16:58:27 -04:00

oak_speech.asm

Commented/labelled misc functions

2014-09-14 11:29:18 -07:00

oam_dma.asm

More wOAMBuffer references.

2014-05-27 11:08:52 -07:00

palettes.asm

Commented more sprite and map code

2014-09-13 00:50:56 -07:00

play_time.asm

Commented/labelled misc functions

2014-09-14 11:29:18 -07:00

pokedex_rating.asm

Remove most static wram addresses. Use labels instead.

2014-05-26 22:04:39 -07:00

predefs7.asm

Commented more sprite and map code

2014-09-13 00:50:56 -07:00

predefs12.asm

Commented more sprite and map code

2014-09-13 00:50:56 -07:00

predefs17_2.asm

Use monster struct macros in wram. Rename related labels for consistency.

2014-06-14 04:12:40 -07:00

predefs17.asm

Use macros for predef calls/jumps instead of static ids.

2014-06-16 13:57:26 -07:00

predefs.asm

Commented/labelled misc functions

2014-09-14 11:29:18 -07:00

random.asm

Rename engine/rng.asm to engine/random.asm.

2014-05-24 11:44:12 -07:00

save.asm

Merge remote-tracking branch 'YamaArashi/master'

2014-09-20 00:57:27 -04:00

slot_machine.asm

Merge remote-tracking branch 'YamaArashi/master'

2014-09-20 00:57:27 -04:00

status_ailments.asm

Pull a lot of engine out of main.asm

2014-05-22 18:13:20 -04:00

titlescreen2.asm

Remove most static wram addresses. Use labels instead.

2014-05-26 22:04:39 -07:00

titlescreen.asm

Commented/labelled misc functions

2014-09-14 11:29:18 -07:00

town_map.asm

Merge remote-tracking branch 'YamaArashi/master'

2014-09-20 00:57:27 -04:00

town_map.asm.orig

Merge remote-tracking branch 'YamaArashi/master'

2014-09-20 00:57:27 -04:00

trade2.asm

Use *Coord instead of FuncCoord

2014-06-25 16:58:27 -04:00

trade.asm

Merge remote-tracking branch 'YamaArashi/master'

2014-09-20 00:57:27 -04:00

turn_sprite.asm

Labelled and commented mostly sprite-related things

2014-09-09 20:55:19 -07:00