diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-25 11:10:08 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-25 11:10:08 -0400 |
commit | 0a440d658b2d4a311381b1d297872e7eece7486f (patch) | |
tree | 55f03923cd4686d146bdd11f5874a310c344a7a6 /data | |
parent | 283084cce49b0bdb65916f35e55654a3b365f452 (diff) |
Finish script_menu code decomp
Diffstat (limited to 'data')
-rw-r--r-- | data/data_835B488.s | 20 | ||||
-rw-r--r-- | data/maps/PewterCity_Museum_1F/scripts.inc | 8 | ||||
-rw-r--r-- | data/specials.inc | 4 |
3 files changed, 19 insertions, 13 deletions
diff --git a/data/data_835B488.s b/data/data_835B488.s index e49b310a6..a909cfbff 100644 --- a/data/data_835B488.s +++ b/data/data_835B488.s @@ -1033,19 +1033,25 @@ gUnknown_83E0738:: @ 83E0738 gUnknown_83E0748:: @ 83E0748 .incbin "baserom.gba", 0x3E0748, 0x20 -gUnknown_83E0768:: @ 83E0768 - .incbin "baserom.gba", 0x3E0768, 0x818 +sMuseumFossilSprTemplate:: @ 83E0768 + .incbin "baserom.gba", 0x3E0768, 0x18 -gUnknown_83E0F80:: @ 83E0F80 - .incbin "baserom.gba", 0x3E0F80, 0x820 +gUnknown_83E7080:: + .incbin "baserom.gba", 0x3E0780, 0x800 -gUnknown_83E17A0:: @ 83E17A0 +sMuseumAerodactylSprPalette:: @ 83E0F80 + .incbin "baserom.gba", 0x3E0F80, 0x20 + +gUnknown_83E0FA0:: + .incbin "baserom.gba", 0x3E0FA0, 0x800 + +sMuseumKabutopsSprPalette:: @ 83E17A0 .incbin "baserom.gba", 0x3E17A0, 0x20 -gUnknown_83E17C0:: @ 83E17C0 +sMuseumKabutopsSprSheets:: @ 83E17C0 .incbin "baserom.gba", 0x3E17C0, 0x10 -gUnknown_83E17D0:: @ 83E17D0 +sMuseumAerodactylSprSheets:: @ 83E17D0 .incbin "baserom.gba", 0x3E17D0, 0x10 gUnknown_83E17E0:: @ 83E17E0 diff --git a/data/maps/PewterCity_Museum_1F/scripts.inc b/data/maps/PewterCity_Museum_1F/scripts.inc index 8a3bdd640..8d4f9dc6d 100644 --- a/data/maps/PewterCity_Museum_1F/scripts.inc +++ b/data/maps/PewterCity_Museum_1F/scripts.inc @@ -190,9 +190,9 @@ PewterCity_Museum_1F_EventScript_16A512:: @ 816A512 setvar VAR_0x8004, SPECIES_AERODACTYL setvar VAR_0x8005, 10 setvar VAR_0x8006, 3 - special sub_809D504 + special Special_OpenMuseumFossilPic msgbox gUnknown_8190945 - special sub_809D620 + special Special_CloseMuseumFossilPic releaseall end @@ -201,8 +201,8 @@ PewterCity_Museum_1F_EventScript_16A532:: @ 816A532 setvar VAR_0x8004, SPECIES_KABUTOPS setvar VAR_0x8005, 10 setvar VAR_0x8006, 3 - special sub_809D504 + special Special_OpenMuseumFossilPic msgbox gUnknown_8190975 - special sub_809D620 + special Special_CloseMuseumFossilPic releaseall end diff --git a/data/specials.inc b/data/specials.inc index 96d997597..ac15812e3 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -403,8 +403,8 @@ gSpecials:: @ 815FD60 def_special sub_8112364 def_special Special_GetMENewsJisanItemAndState def_special get_unknown_box_id - def_special sub_809D504 - def_special sub_809D620 + def_special Special_OpenMuseumFossilPic + def_special Special_CloseMuseumFossilPic def_special sub_812781C def_special sub_8127888 def_special sub_80803FC |