camthesaxman 46023e742c Merge branch 'master' into german_debug ...

Conflicts:
	asm/pokemon_storage_system.s
	data/pokemon_storage_system.s
	src/pokemon/pokemon_1.c
	src/pokemon/pokemon_storage_system.c
	sym_common.txt
	sym_ewram.txt

2018-01-31 17:37:03 -06:00

..

graphics

remove trainer palettes

2017-10-08 21:38:28 -05:00

maps

Merge branch 'master' into fix_file_modes

2018-01-14 17:25:07 -05:00

scripts

move debug scripts to a separate file

2018-01-24 01:18:38 -06:00

text

clean up and label more of contest.c

2017-12-22 17:42:05 -06:00

tilesets

Combine English and German data files

2017-06-23 21:52:37 +02:00

battle_7.s

split data2b

2018-01-16 15:03:22 -05:00

battle_ai_scripts.s

refactor build system

2018-01-10 23:20:32 -06:00

battle_anim_80CA710.s

decompile battle_intro.s

2018-01-12 21:24:21 -06:00

battle_anim_812C144.s

refactor build system

2018-01-10 23:20:32 -06:00

battle_anim_813F0F4.s

refactor build system

2018-01-10 23:20:32 -06:00

battle_anim_scripts.s

refactor build system

2018-01-10 23:20:32 -06:00

battle_interface.s

refactor build system

2018-01-10 23:20:32 -06:00

battle_moves.s

refactor build system

2018-01-10 23:20:32 -06:00

battle_scripts_1.s

import some battle_4.c code from emerald and get atk23_getexp matching

2018-01-15 20:41:55 -06:00

battle_scripts_2.s

refactor build system

2018-01-10 23:20:32 -06:00

btl_attrs.s

dump all remaining baseroms

2018-01-23 17:54:29 -06:00

contest_ai_scripts.s

refactor build system

2018-01-10 23:20:32 -06:00

contest_effect_funcs.inc

included .s to .inc

2016-10-28 15:41:15 -07:00

contest_effect.s

refactor build system

2018-01-10 23:20:32 -06:00

contest_effects.inc

included .s to .inc

2016-10-28 15:41:15 -07:00

contest_excitement_table.inc

included .s to .inc

2016-10-28 15:41:15 -07:00

contest_link_80C2020.s

refactor build system

2018-01-10 23:20:32 -06:00

contest_moves.inc

included .s to .inc

2016-10-28 15:41:15 -07:00

contest_opponents.inc

label and clean up some things in contest.c

2017-12-22 14:19:09 -06:00

contest.s

refactor build system

2018-01-10 23:20:32 -06:00

cute_sketch.s

refactor build system

2018-01-10 23:20:32 -06:00

debug_menu_3.s

dump all remaining baseroms

2018-01-23 17:54:29 -06:00

debug_menu_nohara.s

use 'if DEBUG' instead of 'ifdef DEBUG'

2018-01-17 12:10:41 -06:00

debug_menu_taya.s

use 'if DEBUG' instead of 'ifdef DEBUG'

2018-01-17 12:10:41 -06:00

debug_menu_tomomichi.s

fix more false offsets

2018-01-23 15:29:39 -06:00

debug_menu_watanabe.s

dump some debug baseroms

2018-01-22 21:42:14 -06:00

debug_mystery_event_menu.s

fix build of normal ROMs

2018-01-21 14:27:32 -06:00

easy_chat.s

refactor build system

2018-01-10 23:20:32 -06:00

enemy_mon_elevation.inc

included .s to .inc

2016-10-28 15:41:15 -07:00

event_scripts.s

move debug scripts to a separate file

2018-01-24 01:18:38 -06:00

field_effect_scripts.s

refactor build system

2018-01-10 23:20:32 -06:00

field_move_scripts.inc

Add friendly macros for goto_if and call_if variants

2018-01-05 11:36:47 -08:00

graphics.s

oops, re-add the old charmap labels in graphics.s

2018-01-24 15:39:19 -06:00

gray_sun.s

split data_8393054

2018-01-16 17:18:31 -05:00

item_ball_scripts.inc

improve TM/HM constants and add macro for TM/HM learnsets

2018-01-14 13:41:50 -06:00

map_events.s

refactor build system

2018-01-10 23:20:32 -06:00

maps.s

refactor build system

2018-01-10 23:20:32 -06:00

mon_attrs.s

split data2a and make shop.c stuff static

2018-01-16 14:00:52 -05:00

mystery_event_script_cmd_table.s

finish decompiling mystery_event_script

2017-07-22 17:45:08 -07:00

pc_screen_effect.s

Fix file modes

2018-01-14 17:24:28 -05:00

pokedex_area_screen.s

refactor build system

2018-01-10 23:20:32 -06:00

pokedex_cry_screen.s

refactor build system

2018-01-10 23:20:32 -06:00

pokemon_storage_system.s

Merge branch 'master' into german_debug

2018-01-31 17:37:03 -06:00

pokenav.s

refactor build system

2018-01-10 23:20:32 -06:00

roulette.s

finish adding all debug code

2018-01-18 15:19:31 -06:00

script_cmd_table.inc

Use event script macro names from pokeemerald

2017-12-21 10:41:46 -06:00

smokescreen.s

split data2b

2018-01-16 15:03:22 -05:00

sound_data.s

refactor build system

2018-01-10 23:20:32 -06:00

sparkle.s

split data_8393054

2018-01-16 17:18:31 -05:00

specials.inc

make special ids global

2018-01-20 18:34:37 -05:00

start_menu_debug.s

start decompiling start_menu_debug.c

2018-01-23 20:43:28 -06:00

strings2.s

refactor build system

2018-01-10 23:20:32 -06:00

tilesets.s

refactor build system

2018-01-10 23:20:32 -06:00

trainer_money.inc

Decompile through HandleEndTurn_BattleWon, and update trainer class constant names

2018-01-07 20:07:36 -08:00

trainer_parties.inc

included .s to .inc

2016-10-28 15:41:15 -07:00

trainers.inc

Decompile through HandleEndTurn_BattleWon, and update trainer class constant names

2018-01-07 20:07:36 -08:00

type_effectiveness.inc

included .s to .inc

2016-10-28 15:41:15 -07:00

unk_debug_menu_3.s

dump more baseroms and fix more false offsets

2018-01-23 00:32:33 -06:00

unused_hit.s

split data_8393054

2018-01-16 17:18:31 -05:00

unused_orb2.s

split data_8393054

2018-01-16 17:18:31 -05:00

unused_orb.s

split data_8393054

2018-01-16 17:18:31 -05:00

unused_paw.s

split data_8393054

2018-01-16 17:18:31 -05:00