mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-26 05:10:23 +01:00

Go to file

Marcus Huderle accc5ae8dd Merge remote-tracking branch 'upstream/master' into union_room_chat

# Conflicts:
#	ld_script.txt

2019-03-29 21:27:08 -05:00

.travis/calcrom

Fix symbol overcounting, add partial symbols

2019-03-03 15:02:26 -05:00

asm

Merge remote-tracking branch 'upstream/master' into union_room_chat

2019-03-29 21:27:08 -05:00

common_syms

Merge branch 'master' into main-menu-state-machine

2019-03-02 17:35:44 -05:00

constants

improve checkplayergender calls

2018-12-28 08:22:21 -06:00

data

Merge remote-tracking branch 'upstream/master' into union_room_chat

2019-03-29 21:27:08 -05:00

graphics

Merge remote-tracking branch 'upstream/master' into move-tutor

2019-03-17 17:20:40 -05:00

include

Merge remote-tracking branch 'upstream/master' into union_room_chat

2019-03-29 21:27:08 -05:00

sound

Update se_z_search.mid

2019-03-24 16:37:27 -05:00

src

Merge remote-tracking branch 'upstream/master' into union_room_chat

2019-03-29 21:27:08 -05:00

tools

Scaninc: Don't insert missing headers into dependencies

2019-03-07 09:46:14 -06:00

.gitattributes

Add json to list of LF line-end files

2019-02-05 14:35:31 -06:00

.gitignore

Address review comments, 1

2019-03-28 07:32:25 -05:00

.travis.yml

Update devkitPro version in Travis

2019-01-21 14:04:07 -06:00

asmdiff.ps1

Make a powershell version of asmdiff.sh

2019-03-16 12:26:01 -05:00

asmdiff.sh

convert some constants to C headers

2017-12-05 11:55:48 -06:00

build_tools.sh

convert mapjson.py to mapjson.cpp

2019-02-03 09:38:29 -06:00

charmap.txt

Decompile union_room_chat through sub_8020118

2019-03-28 20:20:52 -05:00

graphics_file_rules.mk

move pokemon graphics to mon-specific directories

2019-03-16 12:21:47 -05:00

INSTALL.md

add troubleshooting line in INSTALL.md

2019-03-16 12:27:30 -05:00

ld_script.txt

Merge remote-tracking branch 'upstream/master' into union_room_chat

2019-03-29 21:27:08 -05:00

Makefile

Support absolute paths

2019-03-07 08:46:55 -06:00

map_data_rules.mk

Fix make to look for .json files instead of folders

2019-03-05 01:46:20 -05:00

porymap.project.cfg

Split out the remaining wireless-related files

2019-03-24 13:15:37 -05:00

README.md

Update Discord link.

2018-10-22 22:20:48 -04:00

rom.sha1

Make rom.sha1 lowercase to fix erroneous comparison results on *nix

2017-09-06 09:20:49 -04:00

songs.mk

Update se_z_search.mid

2019-03-24 16:37:27 -05:00

spritesheet_rules.mk

Rename OW Sprites

2018-10-14 15:49:55 -04:00

sym_bss.txt

Split out the remaining wireless-related files

2019-03-24 13:15:37 -05:00

sym_common.txt

Clean up ram vars

2019-02-02 12:44:00 +01:00

sym_ewram.txt

Port mevent2.c from pokefirered

2019-03-24 18:29:00 -05:00

README.md

Pokémon Emerald

This is a disassembly of Pokémon Emerald.

It builds the following rom:

pokeemerald.gba sha1: f3ae088181bf583e55daf962a92bb46f4f1d07b7

To set up the repository, see INSTALL.md.

README.md

Pokémon Emerald

See also