Merge branch 'master' of https://github.com/pret/pokeemerald into tx_debug_system
This commit is contained in:
commit
2f8896f2f0
2237 files changed
+147115
-136304
No files matched your search
+6
-6
@@ -9,14 +9,14 @@
|
||||
.include "src/link_rfu_3.o"
|
||||
.include "src/link_rfu_2.o"
|
||||
.include "src/union_room.o"
|
||||
.include "src/mystery_gift.o"
|
||||
.include "src/mystery_gift_menu.o"
|
||||
.include "src/union_room_player_avatar.o"
|
||||
.include "src/wireless_communication_status_screen.o"
|
||||
.include "src/union_room_battle.o"
|
||||
.include "src/mevent2.o"
|
||||
.include "src/mevent_801BAAC.o"
|
||||
.include "src/mevent_server.o"
|
||||
.include "src/mevent_client.o"
|
||||
.include "src/mystery_gift.o"
|
||||
.include "src/mystery_gift_view.o"
|
||||
.include "src/mystery_gift_server.o"
|
||||
.include "src/mystery_gift_client.o"
|
||||
.include "src/union_room_chat.o"
|
||||
.include "src/berry_crush.o"
|
||||
.include "src/berry_powder.o"
|
||||
@@ -143,7 +143,7 @@
|
||||
.include "src/pokedex_area_region_map.o"
|
||||
.include "src/battle_pyramid_bag.o"
|
||||
.include "src/pokenav.o"
|
||||
.include "src/pokenav_match_call_ui.o"
|
||||
.include "src/pokenav_list.o"
|
||||
.include "src/menu_specialized.o"
|
||||
.include "src/faraway_island.o"
|
||||
.include "src/trainer_hill.o"
|
||||
|
||||
Reference in new issue
Block a user