dannye 64b4cf624f Merge branch 'master' of https://github.com/YamaArashi/pokered ...

Conflicts:
	engine/evos_moves.asm
	engine/overworld/healing_machine.asm

2015-07-19 03:52:20 -05:00

..

battle

Merge branch 'master' of https://github.com/YamaArashi/pokered

2015-07-19 03:52:20 -05:00

items

Merge branch 'master' of https://github.com/YamaArashi/pokered

2015-07-19 03:52:20 -05:00

menu

Merge branch 'master' of https://github.com/YamaArashi/pokered

2015-07-19 03:52:20 -05:00

overworld

Merge branch 'master' of https://github.com/YamaArashi/pokered

2015-07-19 03:52:20 -05:00

cable_club.asm

misc

2015-07-18 21:58:55 -07:00

clear_save.asm

Consolidate coord macros

2015-07-18 15:52:03 -05:00

evolution.asm

Merge branch 'master' of https://github.com/YamaArashi/pokered

2015-07-19 03:52:20 -05:00

evolve_trade.asm

Comment naming screen

2015-07-14 03:49:49 -05:00

evos_moves.asm

Merge branch 'master' of https://github.com/YamaArashi/pokered

2015-07-19 03:52:20 -05:00

experience.asm

misc

2015-07-18 21:58:55 -07:00

game_corner_slots2.asm

misc

2015-07-18 21:58:55 -07:00

game_corner_slots.asm

misc

2015-07-18 21:58:55 -07:00

gamefreak.asm

Name sound effects

2015-07-19 03:46:12 -05:00

give_pokemon.asm

misc

2015-07-18 21:58:55 -07:00

hall_of_fame.asm

Consolidate coord macros

2015-07-18 15:52:03 -05:00

hidden_object_functions3.asm

Use more *Coord

2015-07-14 00:21:03 -05:00

hidden_object_functions7.asm

Merge branch 'master' of https://github.com/YamaArashi/pokered

2015-07-19 03:52:20 -05:00

hidden_object_functions14.asm

Start using text predef macros

2015-07-04 00:47:29 -05:00

hidden_object_functions17.asm

Merge branch 'master' of https://github.com/YamaArashi/pokered

2015-07-19 03:52:20 -05:00

hidden_object_functions18.asm

Start using text predef macros

2015-07-04 00:47:29 -05:00

HoF_room_pc.asm

misc

2015-07-18 21:58:55 -07:00

hp_bar.asm

Rename/organize part 1 of 4

2015-07-03 14:37:53 -05:00

in_game_trades.asm

menu stuff

2015-07-15 20:04:58 -07:00

intro.asm

Name sound effects

2015-07-19 03:46:12 -05:00

joypad.asm

rename hJoyHeldLast -> hJoyLast

2015-02-07 11:39:49 -08:00

learn_move.asm

Name sound effects

2015-07-19 03:46:12 -05:00

load_pokedex_tiles.asm

Rename/organize part 1 of 4

2015-07-03 14:37:53 -05:00

mon_party_sprites.asm

named town map stuff

2015-07-13 19:24:07 -07:00

multiply_divide.asm

Rename/organize part 1 of 4

2015-07-03 14:37:53 -05:00

oak_speech2.asm

Consolidate coord macros

2015-07-18 15:52:03 -05:00

oak_speech.asm

Merge branch 'master' of https://github.com/YamaArashi/pokered

2015-07-19 03:52:20 -05:00

oam_dma.asm

misc

2015-07-18 21:58:55 -07:00

palettes.asm

misc

2015-07-18 21:58:55 -07:00

play_time.asm

Commented/labelled misc functions

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

pokedex_rating.asm

Rename/organize part 1 of 4

2015-07-03 14:37:53 -05:00

predefs7.asm

named wram variables

2015-07-14 23:16:06 -07:00

predefs12.asm

Merge branch 'master' of https://github.com/YamaArashi/pokered

2015-07-14 00:58:09 -05: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

Rename/organize part 1 of 4

2015-07-03 14:37:53 -05:00

predefs.asm

misc

2015-07-18 21:58:55 -07:00

random.asm

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

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

save.asm

Merge branch 'master' of https://github.com/YamaArashi/pokered

2015-07-19 03:52:20 -05:00

slot_machine.asm

Merge branch 'master' of https://github.com/YamaArashi/pokered

2015-07-19 03:52:20 -05:00

status_ailments.asm

Pull a lot of engine out of main.asm

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

titlescreen2.asm

title / diploma / vending machine

2015-07-17 01:22:00 -07:00

titlescreen.asm

Merge branch 'master' of https://github.com/YamaArashi/pokered

2015-07-19 03:52:20 -05:00

town_map.asm

Name sound effects

2015-07-19 03:46:12 -05:00

trade2.asm

Consolidate coord macros

2015-07-18 15:52:03 -05:00

trade.asm

Name sound effects

2015-07-19 03:46:12 -05:00

turn_sprite.asm

Labelled and commented mostly sprite-related things

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