dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

undo revert

Browse Source
This commit is contained in:
DizzyEggg
2017-10-23 14:40:22 +02:00
parent 5b05811dd9
commit 356eb34e32
137 changed files with 11131 additions and 15649 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/cute_sketch.s
View File

@@ -5,4 +5,4 @@
.align 2, 0
gUnknown_085A1F94:: @ 85A1F94
.incbin "baserom.gba", 0x5a1f94, 0x3c74
.incbin "baserom.gba", 0x5a1f94, 0x2580

86
data/decoration.s
View File

@@ -1,86 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
gDecorations:: @ 85A5C08
.incbin "baserom.gba", 0x5a5c08, 0x1c
gUnknown_085A5C24:: @ 85A5C24
.incbin "baserom.gba", 0x5a5c24, 0xf04
gUnknown_085A6B28:: @ 85A6B28
.incbin "baserom.gba", 0x5a6b28, 0x20
gUnknown_085A6B48:: @ 85A6B48
.incbin "baserom.gba", 0x5a6b48, 0x20
gUnknown_085A6B68:: @ 85A6B68
.incbin "baserom.gba", 0x5a6b68, 0x10
gUnknown_085A6B78:: @ 85A6B78
.incbin "baserom.gba", 0x5a6b78, 0x18
gUnknown_085A6B90:: @ 85A6B90
.incbin "baserom.gba", 0x5a6b90, 0x20
gUnknown_085A6BB0:: @ 85A6BB0
.incbin "baserom.gba", 0x5a6bb0, 0x20
gUnknown_085A6BD0:: @ 85A6BD0
.incbin "baserom.gba", 0x5a6bd0, 0x18
gUnknown_085A6BE8:: @ 85A6BE8
.incbin "baserom.gba", 0x5a6be8, 0x5c8
gUnknown_085A71B0:: @ 85A71B0
.incbin "baserom.gba", 0x5a71b0, 0xa0
gUnknown_085A7250:: @ 85A7250
.incbin "baserom.gba", 0x5a7250, 0x3c
gUnknown_085A728C:: @ 85A728C
.incbin "baserom.gba", 0x5a728c, 0x18
gUnknown_085A72A4:: @ 85A72A4
.incbin "baserom.gba", 0x5a72a4, 0x18
gUnknown_085A72BC:: @ 85A72BC
.incbin "baserom.gba", 0x5a72bc, 0x8
gUnknown_085A72C4:: @ 85A72C4
.incbin "baserom.gba", 0x5a72c4, 0x8
gUnknown_085A72CC:: @ 85A72CC
.incbin "baserom.gba", 0x5a72cc, 0x8
gUnknown_085A72D4:: @ 85A72D4
.incbin "baserom.gba", 0x5a72d4, 0x10
gUnknown_085A72E4:: @ 85A72E4
.incbin "baserom.gba", 0x5a72e4, 0x8
gUnknown_085A72EC:: @ 85A72EC
.incbin "baserom.gba", 0x5a72ec, 0x8
gUnknown_085A72F4:: @ 85A72F4
.incbin "baserom.gba", 0x5a72f4, 0x54
gUnknown_085A7348:: @ 85A7348
.incbin "baserom.gba", 0x5a7348, 0x8
gUnknown_085A7350:: @ 85A7350
.incbin "baserom.gba", 0x5a7350, 0x88
gUnknown_085A73D8:: @ 85A73D8
.incbin "baserom.gba", 0x5a73d8, 0x8
gUnknown_085A73E0:: @ 85A73E0
.incbin "baserom.gba", 0x5a73e0, 0x24
gUnknown_085A7404:: @ 85A7404
.incbin "baserom.gba", 0x5a7404, 0x18
gUnknown_085A741C:: @ 85A741C
.incbin "baserom.gba", 0x5a741c, 0x8

5
data/graphics.s
View File

@@ -881,7 +881,10 @@ gUnknown_08DAAFEC:: @ 8DAAFEC
.include "data/graphics/items/item_graphics.inc"
@ 8DB7AA0
.incbin "baserom.gba", 0xdb7aa0, 0x2a78
.include "data/graphics/decorations/decoration_graphics.inc"
@ 8DBA14C
.incbin "baserom.gba", 0xdba14c, 0x3cc
gUnknown_08DBA518:: @ 8DBA518
.incbin "baserom.gba", 0xdba518, 0x80

252
data/graphics/decorations/decoration_graphics.inc Normal file
View File

@@ -0,0 +1,252 @@
gUnknown_08DB7AA0::
.incbin "graphics/decorations/decor_heavy_desk.4bpp.lz"
gUnknown_08DB7B34::
.incbin "graphics/decorations/decor_heavy_desk.gbapal.lz"
gUnknown_08DB7B5C::
.incbin "graphics/decorations/decor_ragged_desk.4bpp.lz"
gUnknown_08DB7BEC::
.incbin "graphics/decorations/decor_ragged_desk.gbapal.lz"
gUnknown_08DB7C08::
.incbin "graphics/decorations/decor_comfort_desk.4bpp.lz"
gUnknown_08DB7CE8::
.incbin "graphics/decorations/decor_comfort_desk.gbapal.lz"
gUnknown_08DB7D08::
.incbin "graphics/decorations/decor_pretty_desk.4bpp.lz"
gUnknown_08DB7DCC::
.incbin "graphics/decorations/decor_pretty_desk.gbapal.lz"
gUnknown_08DB7DF4::
.incbin "graphics/decorations/decor_brick_desk.4bpp.lz"
gUnknown_08DB7EA0::
.incbin "graphics/decorations/decor_brick_desk.gbapal.lz"
gUnknown_08DB7EC4::
.incbin "graphics/decorations/decor_camp_desk.4bpp.lz"
gUnknown_08DB7F60::
.incbin "graphics/decorations/decor_camp_desk.gbapal.lz"
gUnknown_08DB7F7C::
.incbin "graphics/decorations/decor_hard_desk.4bpp.lz"
gUnknown_08DB8070::
.incbin "graphics/decorations/decor_hard_desk.gbapal.lz"
gUnknown_08DB808C::
.incbin "graphics/decorations/decor_red_plant.4bpp.lz"
gUnknown_08DB8138::
.incbin "graphics/decorations/decor_red_plant.gbapal.lz"
gUnknown_08DB8160::
.incbin "graphics/decorations/decor_tropical_plant.4bpp.lz"
gUnknown_08DB8218::
.incbin "graphics/decorations/decor_tropical_plant.gbapal.lz"
gUnknown_08DB823C::
.incbin "graphics/decorations/decor_pretty_flowers.4bpp.lz"
gUnknown_08DB8300::
.incbin "graphics/decorations/decor_pretty_flowers.gbapal.lz"
gUnknown_08DB8328::
.incbin "graphics/decorations/decor_colorful_plant.4bpp.lz"
gUnknown_08DB8430::
.incbin "graphics/decorations/decor_colorful_plant.gbapal.lz"
gUnknown_08DB8458::
.incbin "graphics/decorations/decor_big_plant.4bpp.lz"
gUnknown_08DB8528::
.incbin "graphics/decorations/decor_big_plant.gbapal.lz"
gUnknown_08DB854C::
.incbin "graphics/decorations/decor_gorgeous_plant.4bpp.lz"
gUnknown_08DB862C::
.incbin "graphics/decorations/decor_gorgeous_plant.gbapal.lz"
gUnknown_08DB8654::
.incbin "graphics/decorations/decor_red_brick.4bpp.lz"
gUnknown_08DB86C4::
.incbin "graphics/decorations/decor_red_brick.gbapal.lz"
gUnknown_08DB86E0::
.incbin "graphics/decorations/decor_yellow_brick.4bpp.lz"
gUnknown_08DB8750::
.incbin "graphics/decorations/decor_yellow_brick.gbapal.lz"
gUnknown_08DB876C::
.incbin "graphics/decorations/decor_blue_brick.4bpp.lz"
gUnknown_08DB87DC::
.incbin "graphics/decorations/decor_blue_brick.gbapal.lz"
gUnknown_08DB87F8::
.incbin "graphics/decorations/decor_red_tent.4bpp.lz"
gUnknown_08DB88D8::
.incbin "graphics/decorations/decor_red_tent.gbapal.lz"
gUnknown_08DB8900::
.incbin "graphics/decorations/decor_blue_tent.4bpp.lz"
gUnknown_08DB89E0::
.incbin "graphics/decorations/decor_blue_tent.gbapal.lz"
gUnknown_08DB8A08::
.incbin "graphics/decorations/decor_solid_board.4bpp.lz"
gUnknown_08DB8A68::
.incbin "graphics/decorations/decor_solid_board.gbapal.lz"
gUnknown_08DB8A84::
.incbin "graphics/decorations/decor_slide.4bpp.lz"
gUnknown_08DB8B40::
.incbin "graphics/decorations/decor_slide.gbapal.lz"
gUnknown_08DB8B68::
.incbin "graphics/decorations/decor_tire.4bpp.lz"
gUnknown_08DB8C40::
.incbin "graphics/decorations/decor_tire.gbapal.lz"
gUnknown_08DB8C5C::
.incbin "graphics/decorations/decor_stand.4bpp.lz"
gUnknown_08DB8CF4::
.incbin "graphics/decorations/decor_stand.gbapal.lz"
gUnknown_08DB8D18::
.incbin "graphics/decorations/decor_breakable_door.4bpp.lz"
gUnknown_08DB8DB0::
.incbin "graphics/decorations/decor_breakable_door.gbapal.lz"
gUnknown_08DB8DD4::
.incbin "graphics/decorations/decor_sand_ornament.4bpp.lz"
gUnknown_08DB8E80::
.incbin "graphics/decorations/decor_sand_ornament.gbapal.lz"
gUnknown_08DB8EA0::
.incbin "graphics/decorations/decor_glass_ornament.4bpp.lz"
gUnknown_08DB8F58::
.incbin "graphics/decorations/decor_glass_ornament.gbapal.lz"
gUnknown_08DB8F7C::
.incbin "graphics/decorations/decor_surf_mat.4bpp.lz"
gUnknown_08DB9038::
.incbin "graphics/decorations/decor_surf_mat.gbapal.lz"
gUnknown_08DB9058::
.incbin "graphics/decorations/decor_thunder_mat.4bpp.lz"
gUnknown_08DB9130::
.incbin "graphics/decorations/decor_thunder_mat.gbapal.lz"
gUnknown_08DB9154::
.incbin "graphics/decorations/decor_fire_blast_mat.4bpp.lz"
gUnknown_08DB9218::
.incbin "graphics/decorations/decor_fire_blast_mat.gbapal.lz"
gUnknown_08DB9234::
.incbin "graphics/decorations/decor_powder_snow_mat.4bpp.lz"
gUnknown_08DB92FC::
.incbin "graphics/decorations/decor_powder_snow_mat.gbapal.lz"
gUnknown_08DB931C::
.incbin "graphics/decorations/decor_attract_mat.4bpp.lz"
gUnknown_08DB93E8::
.incbin "graphics/decorations/decor_attract_mat.gbapal.lz"
gUnknown_08DB940C::
.incbin "graphics/decorations/decor_fissure_mat.4bpp.lz"
gUnknown_08DB94CC::
.incbin "graphics/decorations/decor_fissure_mat.gbapal.lz"
gUnknown_08DB94E8::
.incbin "graphics/decorations/decor_spikes_mat.4bpp.lz"
gUnknown_08DB95AC::
.incbin "graphics/decorations/decor_spikes_mat.gbapal.lz"
gUnknown_08DB95D0::
.incbin "graphics/decorations/decor_snorlax_doll.4bpp.lz"
gUnknown_08DB96C4::
.incbin "graphics/decorations/decor_snorlax_doll.gbapal.lz"
gUnknown_08DB96EC::
.incbin "graphics/decorations/decor_rhydon_doll.4bpp.lz"
gUnknown_08DB97F4::
.incbin "graphics/decorations/decor_rhydon_doll.gbapal.lz"
gUnknown_08DB981C::
.incbin "graphics/decorations/decor_lapras_doll.4bpp.lz"
gUnknown_08DB9908::
.incbin "graphics/decorations/decor_lapras_doll.gbapal.lz"
gUnknown_08DB9930::
.incbin "graphics/decorations/decor_venusaur_doll.4bpp.lz"
gUnknown_08DB9A54::
.incbin "graphics/decorations/decor_venusaur_doll.gbapal.lz"
gUnknown_08DB9A7C::
.incbin "graphics/decorations/decor_charizard_doll.4bpp.lz"
gUnknown_08DB9B7C::
.incbin "graphics/decorations/decor_charizard_doll.gbapal.lz"
gUnknown_08DB9BA4::
.incbin "graphics/decorations/decor_blastoise_doll.4bpp.lz"
gUnknown_08DB9CB0::
.incbin "graphics/decorations/decor_blastoise_doll.gbapal.lz"
gUnknown_08DB9CD8::
.incbin "graphics/decorations/decor_wailmer_doll.4bpp.lz"
gUnknown_08DB9DAC::
.incbin "graphics/decorations/decor_wailmer_doll.gbapal.lz"
gUnknown_08DB9DD4::
.incbin "graphics/decorations/decor_regice_doll.4bpp.lz"
gUnknown_08DB9EE4::
.incbin "graphics/decorations/decor_regice_doll.gbapal.lz"
gUnknown_08DB9F08::
.incbin "graphics/decorations/decor_regirock_doll.4bpp.lz"
gUnknown_08DB9FFC::
.incbin "graphics/decorations/decor_regirock_doll.gbapal.lz"
gUnknown_08DBA020::
.incbin "graphics/decorations/decor_registeel_doll.4bpp.lz"
gUnknown_08DBA12C::
.incbin "graphics/decorations/decor_registeel_doll.gbapal.lz"

5
data/pokemon_summary_screen.s
View File

@@ -40,7 +40,10 @@ gUnknown_0861CD14:: @ 861CD14
.incbin "baserom.gba", 0x61cd14, 0x18
gUnknown_0861CD2C:: @ 861CD2C
.incbin "baserom.gba", 0x61cd2c, 0xa7
.incbin "baserom.gba", 0x61cd2c, 0x27
gUnknown_0861CD53:: @ 861CD53
.incbin "baserom.gba", 0x61cd53, 0x80
gUnknown_0861CDD3:: @ 861CDD3
.incbin "baserom.gba", 0x61cdd3, 0x81

28
data/strings.s
View File

@@ -1517,52 +1517,52 @@ gUnknown_085EA79D:: @ 85EA79D
gUnknown_085EA7A9:: @ 85EA7A9
.string "{STR_VAR_3}{STR_VAR_1}/{STR_VAR_2}$"
gUnknown_085EA7B1:: @ 85EA7B1
gText_Decorate:: @ 85EA7B1
.string "DECORATE$"
gUnknown_085EA7BA:: @ 85EA7BA
gText_PutAway:: @ 85EA7BA
.string "PUT AWAY$"
gUnknown_085EA7C3:: @ 85EA7C3
gText_Toss2:: @ 85EA7C3
.string "TOSS$"
gText_Color161Shadow161:: @ 85EA7C8
.string "{COLOR 161}{SHADOW 161}$"
gUnknown_085EA7CF:: @ 85EA7CF
gText_PutOutSelectedDecorItem:: @ 85EA7CF
.string "Put out the selected decoration item.$"
gUnknown_085EA7F5:: @ 85EA7F5
gText_StoreChosenDecorInPC:: @ 85EA7F5
.string "Store the chosen decoration in the PC.$"
gUnknown_085EA81C:: @ 85EA81C
gText_ThrowAwayUnwantedDecors:: @ 85EA81C
.string "Throw away unwanted decorations.$"
gText_NoDecorations:: @ 85EA83D
.string "There are no decorations.{PAUSE_UNTIL_PRESS}$"
gUnknown_085EA859:: @ 85EA859
gText_Desk:: @ 85EA859
.string "DESK$"
gUnknown_085EA85E:: @ 85EA85E
gText_Chair:: @ 85EA85E
.string "CHAIR$"
gUnknown_085EA864:: @ 85EA864
gText_Plant:: @ 85EA864
.string "PLANT$"
gUnknown_085EA86A:: @ 85EA86A
gText_Ornament:: @ 85EA86A
.string "ORNAMENT$"
gUnknown_085EA873:: @ 85EA873
gText_Mat:: @ 85EA873
.string "MAT$"
gUnknown_085EA877:: @ 85EA877
gText_Poster:: @ 85EA877
.string "POSTER$"
gUnknown_085EA87E:: @ 85EA87E
gText_Doll:: @ 85EA87E
.string "DOLL$"
gUnknown_085EA883:: @ 85EA883
gText_Cushion:: @ 85EA883
.string "CUSHION$"
gText_Gold:: @ 85EA88B