PikalaxALT fdd7e7cb84 Merge branch 'master' into cable_car

2017-12-23 12:57:46 -05:00

..

macros

Revert initclock arg sizes

2017-12-21 16:09:48 -06:00

battle_1.s

opponents, map_objects, hold_effects, game_stat, decorations, battle_move_effects constants

2017-11-26 17:01:50 -06:00

battle_2.s

Rename gScript* vars to gSpecialVar_*

2017-12-21 11:40:37 -06:00

battle_9.s

opponents, map_objects, hold_effects, game_stat, decorations, battle_move_effects constants

2017-11-26 17:01:50 -06:00

battle_anim_812C144.s

remove empty include lines

2017-11-26 17:38:39 -06:00

battle_anim_813F0F4.s

remove empty include lines

2017-11-26 17:38:39 -06:00

battle_anim_81258BC.s

remove empty include lines

2017-11-26 17:38:39 -06:00

battle_intro.s

fix merge conflicts

2017-11-26 23:33:31 -06:00

bug.s

fix merge conflicts

2017-11-26 23:33:31 -06:00

cable_car_util.s

remove empty include lines

2017-11-26 17:38:39 -06:00

cable_car.s

Merge branch 'master' into cable_car

2017-12-23 12:57:46 -05:00

contest_ai.s

Rename gScript* vars to gSpecialVar_*

2017-12-21 11:40:37 -06:00

contest_effect.s

Rename gScript* vars to gSpecialVar_*

2017-12-21 11:40:37 -06:00

contest_link_80C857C.s

remove empty include lines

2017-11-26 17:38:39 -06:00

contest_link_80C2020.s

Rename gScript* vars to gSpecialVar_*

2017-12-21 11:40:37 -06:00

contest.s

Rename gScript* vars to gSpecialVar_*

2017-12-21 11:40:37 -06:00

crt0.s

Build German Sapphire (1.0)

2017-07-09 13:54:21 +02:00

current.s

fix merge conflicts

2017-11-26 23:33:31 -06:00

cute_sketch.s

remove empty include lines

2017-11-26 17:38:39 -06:00

dark.s

fix merge conflicts

2017-11-26 23:33:31 -06:00

dragon.s

fix merge conflicts

2017-11-26 23:33:31 -06:00

easy_chat.s

Rename gScript* vars to gSpecialVar_*

2017-12-21 11:40:37 -06:00

fight.s

fix merge conflicts

2017-11-26 23:33:31 -06:00

fire_2.s

fix merge conflicts

2017-11-26 23:33:31 -06:00

fire.s

fix merge conflicts

2017-11-26 23:33:31 -06:00

flying.s

fix merge conflicts

2017-11-26 23:33:31 -06:00

ghost.s

fix merge conflicts

2017-11-26 23:33:31 -06:00

ground.s

fix merge conflicts

2017-11-26 23:33:31 -06:00

heated_rock.s

Decompile battle_anim heated_rock

2017-12-19 14:51:10 -06:00

ice.s

fix merge conflicts

2017-11-26 23:33:31 -06:00

libagbsyscall.s

remove empty include lines

2017-11-26 17:38:39 -06:00

libgcnmultiboot.s

fix libgcnmultiboot.s struct

2017-02-19 11:39:02 -08:00

m4a_1.s

map out ram variables

2017-07-20 20:13:02 -07:00

m4a_3.s

included .s to .inc

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

macros.inc

included .s to .inc

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

normal.s

fix merge conflicts

2017-11-26 23:33:31 -06:00

pc_screen_effect.s

remove empty include lines

2017-11-26 17:38:39 -06:00

poison.s

fix merge conflicts

2017-11-26 23:33:31 -06:00

pokedex_area_screen.s

remove empty include lines

2017-11-26 17:38:39 -06:00

pokedex_cry_screen.s

remove empty include lines

2017-11-26 17:38:39 -06:00

pokemon_item_effect.s

remove empty include lines

2017-11-26 17:38:39 -06:00

pokemon_storage_system.s

remove empty include lines

2017-11-26 17:38:39 -06:00

pokenav.s

remove empty include lines

2017-11-26 17:38:39 -06:00

psychic.s

fix merge conflicts

2017-11-26 23:33:31 -06:00

rock.s

fix merge conflicts

2017-11-26 23:33:31 -06:00

rom_header.inc

Build German Sapphire (1.0)

2017-07-09 13:54:21 +02:00

roulette_util.s

remove empty include lines

2017-11-26 17:38:39 -06:00

roulette.s

remove empty include lines

2017-11-26 17:38:39 -06:00

slot_machine.s

opponents, map_objects, hold_effects, game_stat, decorations, battle_move_effects constants

2017-11-26 17:01:50 -06:00

unk_text_8095904.s

remove empty include lines

2017-11-26 17:38:39 -06:00

water.s

Start decompiling water

2017-12-18 16:21:24 -06:00

wisp_fire.s

fix merge conflicts

2017-11-26 23:33:31 -06:00