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

Decoration + decoration_inventory (#89)

Browse Source 
* SetDecorationInventoriesPointers

* ClearDecorationInventories

* CheckHasDecoration

* DecorationAdd

* DecorationCheckSpace

* DecorationRemove

* sub_8161A38

* CountDecorations; Funcion renaming

* Disassemble decoration data structs, tilemaps, and descriptions

* sub_8126968

* sub_81269D4

* through sub_8126A88

* through sub_8126B2C

* sub_8126B80

* sub_8126C08

* sub_8126C48

* sub_8126CA4

* sub_8126D10

* sub_8126E44

* sub_8126E8C

* sub_8126F68

* sub_8127058

* sub_8127088

* sub_81270E8

* through sub_8127208

* through sub_8127268

* sub_8127284

* through sub_81272F8

* sub_8127330

* through sub_8127480

* sub_81274A0

* sub_8127500; makefile now tells scaninc to scan headers

* Actual real fix to mapfile being in build/emerald instead of wd

* through sub_812759C

* through sub_812764C

* through sub_8127744

* through sub_81277BC

* sub_81277E8

* sub_8127814

* through sub_81279C4

* through sub_8127ACC

* sub_8127B04

* sub_8127B54

* sub_8127B90

* sub_8127D38

* sub_8127E18

* sub_8127F68

* sub_8128060

* ConfigureCameraObjectForPlacingDecoration

* SetUpPlacingDecorationPlayerAvatar

* sub_812826C

* through sub_8128414

* through sub_81284F4

* sub_812853C

* sub_8128950

* through sub_8128AAC

* through sub_8128BBC

* c1_overworld_prev_quest

* sub_8128C64

* sub_8128CD4

* sub_8128D10

* sub_8128DB4

* through sub_8128E18

* through sub_8129068

* sub_8129088

* through sub_81291E8

* sub_812925C

* sub_81292D0

* sub_81292E8

* gpu_pal_decompress_alloc_tag_and_upload

* AddDecorationIconObjectFromIconTable

* GetDecorationIconPicOrPalette

* AddDecorationIconObjectFromFieldObject

* AddDecorationIconObject

* through sub_8129708

* sub_81297F8

* sub_81298EC

* SetUpPuttingAwayDecorationPlayerAvatar

* sub_8129ABC

* sub_8129B34

* sub_8129BCC

* through sub_8129C74

* through sub_8129D8C

* sub_8129E0C

* sub_8129E74

* sub_8129F20

* sub_8129FC8

* sub_812A040

* nonmatching sub_812A0E8

* through sub_812A22C

* sub_812A25C

* sub_812A2C4

* through sub_812A39C

* Remaining fns in decoration.s

* Decompile decoration headers

* Decompile all remaining decoration data that had already been disassembled

* Disassemble two data objects

* Suggest structure of list menu template

* decompile through decoration list menu template

* Disassemble decoration icon graphics table

* Rip icon gfx

* Decompile deco icon table

* Decompile more data related to drawing decorations

* Decompile gUnknown_085A7250 structs

* Decompile two sprite templates

* Decompile remaining data in decoration.s

* Decompile decoration ewram

* deco -> decor
This commit is contained in:
PikalaxALT
2017-10-22 18:55:07 -04:00
committed by Diegoisawesome
parent 1bab62e1cd
commit c042e5148b
128 changed files with 7359 additions and 7803 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"