From 03674c3032c4e94ec2cf87d2ceecb81eaa6a7c14 Mon Sep 17 00:00:00 2001 From: Missingmew Date: Sat, 17 Jun 2023 22:13:36 +0200 Subject: [PATCH 01/17] simplify bg256_left_scroll_end and bg256_right_scroll_end based on findings with pwaa2 --- src/bg3.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/src/bg3.c b/src/bg3.c index 5c9b309..35abb76 100644 --- a/src/bg3.c +++ b/src/bg3.c @@ -67,14 +67,9 @@ void bg256_right_scroll_end(struct Main * main, u32 sp0) // holy shit my braince for(i = 1; i < 21; i++) { void * ptr; - u16 * mapbuffer; - u32 size; - mapbuffer = gBG3MapBuffer; - ptr = mapbuffer; - ptr += i*64; - size = 2; - DmaCopy16(3, ptr, &mapbuffer[i*32+31], size); // dear capcom dev who wrote a dma copy with size of 2 here, i am sincerely sorry but fuck you - ptr = (void*)BG_CHAR_ADDR(1) + (main->Bg256_buff_pos * sl) + (i-1) * r8; + ptr = &gBG3MapBuffer[i*32]; + DmaCopy16(3, ptr, &gBG3MapBuffer[i*32+31], 2); // dear capcom dev who wrote a dma copy with size of 2 here, i am sincerely sorry but fuck you + ptr = ((void*)BG_CHAR_ADDR(1) + (main->Bg256_buff_pos * sl) + (i-1) * r8); DmaCopy16(3, r6, ptr, sl); r6 += sp0; } @@ -172,13 +167,11 @@ void bg256_left_scroll_end(struct Main * main, u32 r6) r5 += main->Bg256_next_line * 0x40; for(i = 1; i < 21; i++) { - void * ptr1; - void * ptr2; - ptr1 = &gBG3MapBuffer[i*32+31]; - ptr2 = &gBG3MapBuffer[i*32]; - DmaCopy16(3, ptr1, ptr2, 2); - ptr1 = (void*)BG_CHAR_ADDR(1) + (main->Bg256_buff_pos * sp0) + (i-1) * sl; - DmaCopy16(3, r5, ptr1, sp0); + void * ptr; + ptr = &gBG3MapBuffer[i*32+31]; + DmaCopy16(3, &gBG3MapBuffer[i*32+31], &gBG3MapBuffer[i*32], 2); // dear capcom dev who wrote a dma copy with size of 2 here, i am sincerely sorry but fuck you + ptr = ((void*)BG_CHAR_ADDR(1) + (main->Bg256_buff_pos * sp0) + (i-1) * sl); + DmaCopy16(3, r5, ptr, sp0); r5 += r6; } if(--main->Bg256_buff_pos < 0) From f2e75090e113a1ed1d7c2a6b0240e173a071fcc9 Mon Sep 17 00:00:00 2001 From: Missingmew Date: Fri, 1 Sep 2023 20:44:39 +0200 Subject: [PATCH 02/17] name evidence profile pictures --- data/graphics.s | 256 +++++++++--------- .../{001CC76C.png => evidence/air_tube.png} | Bin .../article_gourdy.png} | Bin .../{001B51AC.png => evidence/bullet.png} | Bin .../cindy_stones_passport.png} | Bin .../codys_digital_camera.png} | Bin .../codys_steel_samurai_scrapbook.png} | Bin .../dl-6_bullet.png} | Bin .../empty_bottle.png} | Bin .../empty_plate.png} | Bin .../firecrackers.png} | Bin .../fishing_pole.png} | Bin .../generic_affidavit.png} | Bin .../generic_autopsy_report.png} | Bin .../generic_letter.png} | Bin .../generic_newspaper_clipping.png} | Bin .../generic_photo.png} | Bin .../glass_shards.png} | Bin .../global_studios_card_key.png} | Bin .../global_studios_van.png} | Bin .../key_to_cottage.png} | Bin .../lottas_camera.png} | Bin .../{001BEC0C.png => evidence/maya_memo.png} | Bin .../mayas_cellphone.png} | Bin .../metal_detector.png} | Bin .../{001CD7AC.png => evidence/missile.png} | Bin .../missile_angry.png} | Bin .../{001C65EC.png => evidence/mr_monkey.png} | Bin .../note_from_the_safe.png} | Bin .../phoenix_badge.png} | Bin .../{001CBF4C.png => evidence/pistol.png} | Bin .../plate_with_steak_bones.png} | Bin .../{001CF82C.png => evidence/polly.png} | Bin .../steel_samurai_cards.png} | Bin .../steel_samurai_script.png} | Bin .../steel_samurai_spear.png} | Bin .../steel_samurai_ultra_rare_card.png} | Bin .../the_thinker.png} | Bin .../{001B394C.png => evidence/wiretap.png} | Bin .../yannis_safe.png} | Bin .../{001B826C.png => profiles/april_may.png} | Bin .../{001B8A8C.png => profiles/bellboy.png} | Bin .../cindy_stone.png} | Bin .../cody_hackins.png} | Bin .../dee_vasquez.png} | Bin .../dick_gumshoe.png} | Bin .../frank_sahwit.png} | Bin .../gregory_edgeworth.png} | Bin .../jack_hammer.png} | Bin .../{001BC36C.png => profiles/larry_butz.png} | Bin .../{001D004C.png => profiles/lotta_hart.png} | Bin .../manfred_von_karma.png} | Bin .../marvin_grossberg.png} | Bin .../{001BE3EC.png => profiles/maya_fey.png} | Bin .../{001BBB4C.png => profiles/mia_fey.png} | Bin .../miles_edgeworth.png} | Bin .../{001C0C8C.png => profiles/misty_fey.png} | Bin .../{001D20CC.png => profiles/old_man.png} | Bin .../penny_nichols.png} | Bin .../{001B92AC.png => profiles/redd_white.png} | Bin .../robert_hammond.png} | Bin .../sal_manella.png} | Bin .../wendy_oldbag.png} | Bin .../will_powers.png} | Bin .../winston_payne.png} | Bin 65 files changed, 128 insertions(+), 128 deletions(-) rename graphics/evidence_profile_pictures/{001CC76C.png => evidence/air_tube.png} (100%) rename graphics/evidence_profile_pictures/{001B498C.png => evidence/article_gourdy.png} (100%) rename graphics/evidence_profile_pictures/{001B51AC.png => evidence/bullet.png} (100%) rename graphics/evidence_profile_pictures/{001BA2EC.png => evidence/cindy_stones_passport.png} (100%) rename graphics/evidence_profile_pictures/{001C456C.png => evidence/codys_digital_camera.png} (100%) rename graphics/evidence_profile_pictures/{001C6E0C.png => evidence/codys_steel_samurai_scrapbook.png} (100%) rename graphics/evidence_profile_pictures/{001CE7EC.png => evidence/dl-6_bullet.png} (100%) rename graphics/evidence_profile_pictures/{001C352C.png => evidence/empty_bottle.png} (100%) rename graphics/evidence_profile_pictures/{001B290C.png => evidence/empty_plate.png} (100%) rename graphics/evidence_profile_pictures/{001CB72C.png => evidence/firecrackers.png} (100%) rename graphics/evidence_profile_pictures/{001CF00C.png => evidence/fishing_pole.png} (100%) rename graphics/evidence_profile_pictures/{001BB32C.png => evidence/generic_affidavit.png} (100%) rename graphics/evidence_profile_pictures/{001BAB0C.png => evidence/generic_autopsy_report.png} (100%) rename graphics/evidence_profile_pictures/{001B61EC.png => evidence/generic_letter.png} (100%) rename graphics/evidence_profile_pictures/{001C046C.png => evidence/generic_newspaper_clipping.png} (100%) rename graphics/evidence_profile_pictures/{001B722C.png => evidence/generic_photo.png} (100%) rename graphics/evidence_profile_pictures/{001BFC4C.png => evidence/glass_shards.png} (100%) rename graphics/evidence_profile_pictures/{001C55AC.png => evidence/global_studios_card_key.png} (100%) rename graphics/evidence_profile_pictures/{001C762C.png => evidence/global_studios_van.png} (100%) rename graphics/evidence_profile_pictures/{001C5DCC.png => evidence/key_to_cottage.png} (100%) rename graphics/evidence_profile_pictures/{001B312C.png => evidence/lottas_camera.png} (100%) rename graphics/evidence_profile_pictures/{001BEC0C.png => evidence/maya_memo.png} (100%) rename graphics/evidence_profile_pictures/{001B416C.png => evidence/mayas_cellphone.png} (100%) rename graphics/evidence_profile_pictures/{001CCF8C.png => evidence/metal_detector.png} (100%) rename graphics/evidence_profile_pictures/{001CD7AC.png => evidence/missile.png} (100%) rename graphics/evidence_profile_pictures/{001CDFCC.png => evidence/missile_angry.png} (100%) rename graphics/evidence_profile_pictures/{001C65EC.png => evidence/mr_monkey.png} (100%) rename graphics/evidence_profile_pictures/{001B6A0C.png => evidence/note_from_the_safe.png} (100%) rename graphics/evidence_profile_pictures/{001B59CC.png => evidence/phoenix_badge.png} (100%) rename graphics/evidence_profile_pictures/{001CBF4C.png => evidence/pistol.png} (100%) rename graphics/evidence_profile_pictures/{001C4D8C.png => evidence/plate_with_steak_bones.png} (100%) rename graphics/evidence_profile_pictures/{001CF82C.png => evidence/polly.png} (100%) rename graphics/evidence_profile_pictures/{001C24EC.png => evidence/steel_samurai_cards.png} (100%) rename graphics/evidence_profile_pictures/{001C3D4C.png => evidence/steel_samurai_script.png} (100%) rename graphics/evidence_profile_pictures/{001BF42C.png => evidence/steel_samurai_spear.png} (100%) rename graphics/evidence_profile_pictures/{001C2D0C.png => evidence/steel_samurai_ultra_rare_card.png} (100%) rename graphics/evidence_profile_pictures/{001B9ACC.png => evidence/the_thinker.png} (100%) rename graphics/evidence_profile_pictures/{001B394C.png => evidence/wiretap.png} (100%) rename graphics/evidence_profile_pictures/{001D28EC.png => evidence/yannis_safe.png} (100%) rename graphics/evidence_profile_pictures/{001B826C.png => profiles/april_may.png} (100%) rename graphics/evidence_profile_pictures/{001B8A8C.png => profiles/bellboy.png} (100%) rename graphics/evidence_profile_pictures/{001BCB8C.png => profiles/cindy_stone.png} (100%) rename graphics/evidence_profile_pictures/{001C7E4C.png => profiles/cody_hackins.png} (100%) rename graphics/evidence_profile_pictures/{001C8E8C.png => profiles/dee_vasquez.png} (100%) rename graphics/evidence_profile_pictures/{001B7A4C.png => profiles/dick_gumshoe.png} (100%) rename graphics/evidence_profile_pictures/{001BD3AC.png => profiles/frank_sahwit.png} (100%) rename graphics/evidence_profile_pictures/{001D108C.png => profiles/gregory_edgeworth.png} (100%) rename graphics/evidence_profile_pictures/{001CA6EC.png => profiles/jack_hammer.png} (100%) rename graphics/evidence_profile_pictures/{001BC36C.png => profiles/larry_butz.png} (100%) rename graphics/evidence_profile_pictures/{001D004C.png => profiles/lotta_hart.png} (100%) rename graphics/evidence_profile_pictures/{001D086C.png => profiles/manfred_von_karma.png} (100%) rename graphics/evidence_profile_pictures/{001C14AC.png => profiles/marvin_grossberg.png} (100%) rename graphics/evidence_profile_pictures/{001BE3EC.png => profiles/maya_fey.png} (100%) rename graphics/evidence_profile_pictures/{001BBB4C.png => profiles/mia_fey.png} (100%) rename graphics/evidence_profile_pictures/{001C1CCC.png => profiles/miles_edgeworth.png} (100%) rename graphics/evidence_profile_pictures/{001C0C8C.png => profiles/misty_fey.png} (100%) rename graphics/evidence_profile_pictures/{001D20CC.png => profiles/old_man.png} (100%) rename graphics/evidence_profile_pictures/{001C96AC.png => profiles/penny_nichols.png} (100%) rename graphics/evidence_profile_pictures/{001B92AC.png => profiles/redd_white.png} (100%) rename graphics/evidence_profile_pictures/{001D18AC.png => profiles/robert_hammond.png} (100%) rename graphics/evidence_profile_pictures/{001C9ECC.png => profiles/sal_manella.png} (100%) rename graphics/evidence_profile_pictures/{001CAF0C.png => profiles/wendy_oldbag.png} (100%) rename graphics/evidence_profile_pictures/{001C866C.png => profiles/will_powers.png} (100%) rename graphics/evidence_profile_pictures/{001BDBCC.png => profiles/winston_payne.png} (100%) diff --git a/data/graphics.s b/data/graphics.s index 2ce51e6..f6190b7 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -651,515 +651,515 @@ gUnknown_081B290C: .global gUnknown_081B290C_pal gUnknown_081B290C_pal: - .incbin "graphics/evidence_profile_pictures/001B290C.gbapal" + .incbin "graphics/evidence_profile_pictures/evidence/empty_plate.gbapal" .global gUnknown_081B290C_gfx gUnknown_081B290C_gfx: - .incbin "graphics/evidence_profile_pictures/001B290C.4bpp" + .incbin "graphics/evidence_profile_pictures/evidence/empty_plate.4bpp" .global gUnknown_081B312C_pal gUnknown_081B312C_pal: - .incbin "graphics/evidence_profile_pictures/001B312C.gbapal" + .incbin "graphics/evidence_profile_pictures/evidence/lottas_camera.gbapal" .global gUnknown_081B312C_gfx gUnknown_081B312C_gfx: - .incbin "graphics/evidence_profile_pictures/001B312C.4bpp" + .incbin "graphics/evidence_profile_pictures/evidence/lottas_camera.4bpp" .global gUnknown_081B394C_pal gUnknown_081B394C_pal: - .incbin "graphics/evidence_profile_pictures/001B394C.gbapal" + .incbin "graphics/evidence_profile_pictures/evidence/wiretap.gbapal" .global gUnknown_081B394C_gfx gUnknown_081B394C_gfx: - .incbin "graphics/evidence_profile_pictures/001B394C.4bpp" + .incbin "graphics/evidence_profile_pictures/evidence/wiretap.4bpp" .global gUnknown_081B416C_pal gUnknown_081B416C_pal: - .incbin "graphics/evidence_profile_pictures/001B416C.gbapal" + .incbin "graphics/evidence_profile_pictures/evidence/mayas_cellphone.gbapal" .global gUnknown_081B416C_gfx gUnknown_081B416C_gfx: - .incbin "graphics/evidence_profile_pictures/001B416C.4bpp" + .incbin "graphics/evidence_profile_pictures/evidence/mayas_cellphone.4bpp" .global gUnknown_081B498C_pal gUnknown_081B498C_pal: - .incbin "graphics/evidence_profile_pictures/001B498C.gbapal" + .incbin "graphics/evidence_profile_pictures/evidence/article_gourdy.gbapal" .global gUnknown_081B498C_gfx gUnknown_081B498C_gfx: - .incbin "graphics/evidence_profile_pictures/001B498C.4bpp" + .incbin "graphics/evidence_profile_pictures/evidence/article_gourdy.4bpp" .global gUnknown_081B51AC_pal gUnknown_081B51AC_pal: - .incbin "graphics/evidence_profile_pictures/001B51AC.gbapal" + .incbin "graphics/evidence_profile_pictures/evidence/bullet.gbapal" .global gUnknown_081B51AC_gfx gUnknown_081B51AC_gfx: - .incbin "graphics/evidence_profile_pictures/001B51AC.4bpp" + .incbin "graphics/evidence_profile_pictures/evidence/bullet.4bpp" .global gUnknown_081B59CC_pal gUnknown_081B59CC_pal: - .incbin "graphics/evidence_profile_pictures/001B59CC.gbapal" + .incbin "graphics/evidence_profile_pictures/evidence/phoenix_badge.gbapal" .global gUnknown_081B59CC_gfx gUnknown_081B59CC_gfx: - .incbin "graphics/evidence_profile_pictures/001B59CC.4bpp" + .incbin "graphics/evidence_profile_pictures/evidence/phoenix_badge.4bpp" .global gUnknown_081B61EC_pal gUnknown_081B61EC_pal: - .incbin "graphics/evidence_profile_pictures/001B61EC.gbapal" + .incbin "graphics/evidence_profile_pictures/evidence/generic_letter.gbapal" .global gUnknown_081B61EC_gfx gUnknown_081B61EC_gfx: - .incbin "graphics/evidence_profile_pictures/001B61EC.4bpp" + .incbin "graphics/evidence_profile_pictures/evidence/generic_letter.4bpp" .global gUnknown_081B6A0C_pal gUnknown_081B6A0C_pal: - .incbin "graphics/evidence_profile_pictures/001B6A0C.gbapal" + .incbin "graphics/evidence_profile_pictures/evidence/note_from_the_safe.gbapal" .global gUnknown_081B6A0C_gfx gUnknown_081B6A0C_gfx: - .incbin "graphics/evidence_profile_pictures/001B6A0C.4bpp" + .incbin "graphics/evidence_profile_pictures/evidence/note_from_the_safe.4bpp" .global gUnknown_081B722C_pal gUnknown_081B722C_pal: - .incbin "graphics/evidence_profile_pictures/001B722C.gbapal" + .incbin "graphics/evidence_profile_pictures/evidence/generic_photo.gbapal" .global gUnknown_081B722C_gfx gUnknown_081B722C_gfx: - .incbin "graphics/evidence_profile_pictures/001B722C.4bpp" + .incbin "graphics/evidence_profile_pictures/evidence/generic_photo.4bpp" .global gUnknown_081B7A4C_pal gUnknown_081B7A4C_pal: - .incbin "graphics/evidence_profile_pictures/001B7A4C.gbapal" + .incbin "graphics/evidence_profile_pictures/profiles/dick_gumshoe.gbapal" .global gUnknown_081B7A4C_gfx gUnknown_081B7A4C_gfx: - .incbin "graphics/evidence_profile_pictures/001B7A4C.4bpp" + .incbin "graphics/evidence_profile_pictures/profiles/dick_gumshoe.4bpp" .global gUnknown_081B826C_pal gUnknown_081B826C_pal: - .incbin "graphics/evidence_profile_pictures/001B826C.gbapal" + .incbin "graphics/evidence_profile_pictures/profiles/april_may.gbapal" .global gUnknown_081B826C_gfx gUnknown_081B826C_gfx: - .incbin "graphics/evidence_profile_pictures/001B826C.4bpp" + .incbin "graphics/evidence_profile_pictures/profiles/april_may.4bpp" .global gUnknown_081B8A8C_pal gUnknown_081B8A8C_pal: - .incbin "graphics/evidence_profile_pictures/001B8A8C.gbapal" + .incbin "graphics/evidence_profile_pictures/profiles/bellboy.gbapal" .global gUnknown_081B8A8C_gfx gUnknown_081B8A8C_gfx: - .incbin "graphics/evidence_profile_pictures/001B8A8C.4bpp" + .incbin "graphics/evidence_profile_pictures/profiles/bellboy.4bpp" .global gUnknown_081B92AC_pal gUnknown_081B92AC_pal: - .incbin "graphics/evidence_profile_pictures/001B92AC.gbapal" + .incbin "graphics/evidence_profile_pictures/profiles/redd_white.gbapal" .global gUnknown_081B92AC_gfx gUnknown_081B92AC_gfx: - .incbin "graphics/evidence_profile_pictures/001B92AC.4bpp" + .incbin "graphics/evidence_profile_pictures/profiles/redd_white.4bpp" .global gUnknown_081B9ACC_pal gUnknown_081B9ACC_pal: - .incbin "graphics/evidence_profile_pictures/001B9ACC.gbapal" + .incbin "graphics/evidence_profile_pictures/evidence/the_thinker.gbapal" .global gUnknown_081B9ACC_gfx gUnknown_081B9ACC_gfx: - .incbin "graphics/evidence_profile_pictures/001B9ACC.4bpp" + .incbin "graphics/evidence_profile_pictures/evidence/the_thinker.4bpp" .global gUnknown_081BA2EC_pal gUnknown_081BA2EC_pal: - .incbin "graphics/evidence_profile_pictures/001BA2EC.gbapal" + .incbin "graphics/evidence_profile_pictures/evidence/cindy_stones_passport.gbapal" .global gUnknown_081BA2EC_gfx gUnknown_081BA2EC_gfx: - .incbin "graphics/evidence_profile_pictures/001BA2EC.4bpp" + .incbin "graphics/evidence_profile_pictures/evidence/cindy_stones_passport.4bpp" .global gUnknown_081BAB0C_pal gUnknown_081BAB0C_pal: - .incbin "graphics/evidence_profile_pictures/001BAB0C.gbapal" + .incbin "graphics/evidence_profile_pictures/evidence/generic_autopsy_report.gbapal" .global gUnknown_081BAB0C_gfx gUnknown_081BAB0C_gfx: - .incbin "graphics/evidence_profile_pictures/001BAB0C.4bpp" + .incbin "graphics/evidence_profile_pictures/evidence/generic_autopsy_report.4bpp" .global gUnknown_081BB32C_pal gUnknown_081BB32C_pal: - .incbin "graphics/evidence_profile_pictures/001BB32C.gbapal" + .incbin "graphics/evidence_profile_pictures/evidence/generic_affidavit.gbapal" .global gUnknown_081BB32C_gfx gUnknown_081BB32C_gfx: - .incbin "graphics/evidence_profile_pictures/001BB32C.4bpp" + .incbin "graphics/evidence_profile_pictures/evidence/generic_affidavit.4bpp" .global gUnknown_081BBB4C_pal gUnknown_081BBB4C_pal: - .incbin "graphics/evidence_profile_pictures/001BBB4C.gbapal" + .incbin "graphics/evidence_profile_pictures/profiles/mia_fey.gbapal" .global gUnknown_081BBB4C_gfx gUnknown_081BBB4C_gfx: - .incbin "graphics/evidence_profile_pictures/001BBB4C.4bpp" + .incbin "graphics/evidence_profile_pictures/profiles/mia_fey.4bpp" .global gUnknown_081BC36C_pal gUnknown_081BC36C_pal: - .incbin "graphics/evidence_profile_pictures/001BC36C.gbapal" + .incbin "graphics/evidence_profile_pictures/profiles/larry_butz.gbapal" .global gUnknown_081BC36C_gfx gUnknown_081BC36C_gfx: - .incbin "graphics/evidence_profile_pictures/001BC36C.4bpp" + .incbin "graphics/evidence_profile_pictures/profiles/larry_butz.4bpp" .global gUnknown_081BCB8C_pal gUnknown_081BCB8C_pal: - .incbin "graphics/evidence_profile_pictures/001BCB8C.gbapal" + .incbin "graphics/evidence_profile_pictures/profiles/cindy_stone.gbapal" .global gUnknown_081BCB8C_gfx gUnknown_081BCB8C_gfx: - .incbin "graphics/evidence_profile_pictures/001BCB8C.4bpp" + .incbin "graphics/evidence_profile_pictures/profiles/cindy_stone.4bpp" .global gUnknown_081BD3AC_pal gUnknown_081BD3AC_pal: - .incbin "graphics/evidence_profile_pictures/001BD3AC.gbapal" + .incbin "graphics/evidence_profile_pictures/profiles/frank_sahwit.gbapal" .global gUnknown_081BD3AC_gfx gUnknown_081BD3AC_gfx: - .incbin "graphics/evidence_profile_pictures/001BD3AC.4bpp" + .incbin "graphics/evidence_profile_pictures/profiles/frank_sahwit.4bpp" .global gUnknown_081BDBCC_pal gUnknown_081BDBCC_pal: - .incbin "graphics/evidence_profile_pictures/001BDBCC.gbapal" + .incbin "graphics/evidence_profile_pictures/profiles/winston_payne.gbapal" .global gUnknown_081BDBCC_gfx gUnknown_081BDBCC_gfx: - .incbin "graphics/evidence_profile_pictures/001BDBCC.4bpp" + .incbin "graphics/evidence_profile_pictures/profiles/winston_payne.4bpp" .global gUnknown_081BE3EC_pal gUnknown_081BE3EC_pal: - .incbin "graphics/evidence_profile_pictures/001BE3EC.gbapal" + .incbin "graphics/evidence_profile_pictures/profiles/maya_fey.gbapal" .global gUnknown_081BE3EC_gfx gUnknown_081BE3EC_gfx: - .incbin "graphics/evidence_profile_pictures/001BE3EC.4bpp" + .incbin "graphics/evidence_profile_pictures/profiles/maya_fey.4bpp" .global gUnknown_081BEC0C_pal gUnknown_081BEC0C_pal: - .incbin "graphics/evidence_profile_pictures/001BEC0C.gbapal" + .incbin "graphics/evidence_profile_pictures/evidence/maya_memo.gbapal" .global gUnknown_081BEC0C_gfx gUnknown_081BEC0C_gfx: - .incbin "graphics/evidence_profile_pictures/001BEC0C.4bpp" + .incbin "graphics/evidence_profile_pictures/evidence/maya_memo.4bpp" .global gUnknown_081BF42C_pal gUnknown_081BF42C_pal: - .incbin "graphics/evidence_profile_pictures/001BF42C.gbapal" + .incbin "graphics/evidence_profile_pictures/evidence/steel_samurai_spear.gbapal" .global gUnknown_081BF42C_gfx gUnknown_081BF42C_gfx: - .incbin "graphics/evidence_profile_pictures/001BF42C.4bpp" + .incbin "graphics/evidence_profile_pictures/evidence/steel_samurai_spear.4bpp" .global gUnknown_081BFC4C_pal gUnknown_081BFC4C_pal: - .incbin "graphics/evidence_profile_pictures/001BFC4C.gbapal" + .incbin "graphics/evidence_profile_pictures/evidence/glass_shards.gbapal" .global gUnknown_081BFC4C_gfx gUnknown_081BFC4C_gfx: - .incbin "graphics/evidence_profile_pictures/001BFC4C.4bpp" + .incbin "graphics/evidence_profile_pictures/evidence/glass_shards.4bpp" .global gUnknown_081C046C_pal gUnknown_081C046C_pal: - .incbin "graphics/evidence_profile_pictures/001C046C.gbapal" + .incbin "graphics/evidence_profile_pictures/evidence/generic_newspaper_clipping.gbapal" .global gUnknown_081C046C_gfx gUnknown_081C046C_gfx: - .incbin "graphics/evidence_profile_pictures/001C046C.4bpp" + .incbin "graphics/evidence_profile_pictures/evidence/generic_newspaper_clipping.4bpp" .global gUnknown_081C0C8C_pal gUnknown_081C0C8C_pal: - .incbin "graphics/evidence_profile_pictures/001C0C8C.gbapal" + .incbin "graphics/evidence_profile_pictures/profiles/misty_fey.gbapal" .global gUnknown_081C0C8C_gfx gUnknown_081C0C8C_gfx: - .incbin "graphics/evidence_profile_pictures/001C0C8C.4bpp" + .incbin "graphics/evidence_profile_pictures/profiles/misty_fey.4bpp" .global gUnknown_081C14AC_pal gUnknown_081C14AC_pal: - .incbin "graphics/evidence_profile_pictures/001C14AC.gbapal" + .incbin "graphics/evidence_profile_pictures/profiles/marvin_grossberg.gbapal" .global gUnknown_081C14AC_gfx gUnknown_081C14AC_gfx: - .incbin "graphics/evidence_profile_pictures/001C14AC.4bpp" + .incbin "graphics/evidence_profile_pictures/profiles/marvin_grossberg.4bpp" .global gUnknown_081C1CCC_pal gUnknown_081C1CCC_pal: - .incbin "graphics/evidence_profile_pictures/001C1CCC.gbapal" + .incbin "graphics/evidence_profile_pictures/profiles/miles_edgeworth.gbapal" .global gUnknown_081C1CCC_gfx gUnknown_081C1CCC_gfx: - .incbin "graphics/evidence_profile_pictures/001C1CCC.4bpp" + .incbin "graphics/evidence_profile_pictures/profiles/miles_edgeworth.4bpp" .global gUnknown_081C24EC_pal gUnknown_081C24EC_pal: - .incbin "graphics/evidence_profile_pictures/001C24EC.gbapal" + .incbin "graphics/evidence_profile_pictures/evidence/steel_samurai_cards.gbapal" .global gUnknown_081C24EC_gfx gUnknown_081C24EC_gfx: - .incbin "graphics/evidence_profile_pictures/001C24EC.4bpp" + .incbin "graphics/evidence_profile_pictures/evidence/steel_samurai_cards.4bpp" .global gUnknown_081C2D0C_pal gUnknown_081C2D0C_pal: - .incbin "graphics/evidence_profile_pictures/001C2D0C.gbapal" + .incbin "graphics/evidence_profile_pictures/evidence/steel_samurai_ultra_rare_card.gbapal" .global gUnknown_081C2D0C_gfx gUnknown_081C2D0C_gfx: - .incbin "graphics/evidence_profile_pictures/001C2D0C.4bpp" + .incbin "graphics/evidence_profile_pictures/evidence/steel_samurai_ultra_rare_card.4bpp" .global gUnknown_081C352C_pal gUnknown_081C352C_pal: - .incbin "graphics/evidence_profile_pictures/001C352C.gbapal" + .incbin "graphics/evidence_profile_pictures/evidence/empty_bottle.gbapal" .global gUnknown_081C352C_gfx gUnknown_081C352C_gfx: - .incbin "graphics/evidence_profile_pictures/001C352C.4bpp" + .incbin "graphics/evidence_profile_pictures/evidence/empty_bottle.4bpp" .global gUnknown_081C3D4C_pal gUnknown_081C3D4C_pal: - .incbin "graphics/evidence_profile_pictures/001C3D4C.gbapal" + .incbin "graphics/evidence_profile_pictures/evidence/steel_samurai_script.gbapal" .global gUnknown_081C3D4C_gfx gUnknown_081C3D4C_gfx: - .incbin "graphics/evidence_profile_pictures/001C3D4C.4bpp" + .incbin "graphics/evidence_profile_pictures/evidence/steel_samurai_script.4bpp" .global gUnknown_081C456C_pal gUnknown_081C456C_pal: - .incbin "graphics/evidence_profile_pictures/001C456C.gbapal" + .incbin "graphics/evidence_profile_pictures/evidence/codys_digital_camera.gbapal" .global gUnknown_081C456C_gfx gUnknown_081C456C_gfx: - .incbin "graphics/evidence_profile_pictures/001C456C.4bpp" + .incbin "graphics/evidence_profile_pictures/evidence/codys_digital_camera.4bpp" .global gUnknown_081C4D8C_pal gUnknown_081C4D8C_pal: - .incbin "graphics/evidence_profile_pictures/001C4D8C.gbapal" + .incbin "graphics/evidence_profile_pictures/evidence/plate_with_steak_bones.gbapal" .global gUnknown_081C4D8C_gfx gUnknown_081C4D8C_gfx: - .incbin "graphics/evidence_profile_pictures/001C4D8C.4bpp" + .incbin "graphics/evidence_profile_pictures/evidence/plate_with_steak_bones.4bpp" .global gUnknown_081C55AC_pal gUnknown_081C55AC_pal: - .incbin "graphics/evidence_profile_pictures/001C55AC.gbapal" + .incbin "graphics/evidence_profile_pictures/evidence/global_studios_card_key.gbapal" .global gUnknown_081C55AC_gfx gUnknown_081C55AC_gfx: - .incbin "graphics/evidence_profile_pictures/001C55AC.4bpp" + .incbin "graphics/evidence_profile_pictures/evidence/global_studios_card_key.4bpp" .global gUnknown_081C5DCC_pal gUnknown_081C5DCC_pal: - .incbin "graphics/evidence_profile_pictures/001C5DCC.gbapal" + .incbin "graphics/evidence_profile_pictures/evidence/key_to_cottage.gbapal" .global gUnknown_081C5DCC_gfx gUnknown_081C5DCC_gfx: - .incbin "graphics/evidence_profile_pictures/001C5DCC.4bpp" + .incbin "graphics/evidence_profile_pictures/evidence/key_to_cottage.4bpp" .global gUnknown_081C65EC_pal gUnknown_081C65EC_pal: - .incbin "graphics/evidence_profile_pictures/001C65EC.gbapal" + .incbin "graphics/evidence_profile_pictures/evidence/mr_monkey.gbapal" .global gUnknown_081C65EC_gfx gUnknown_081C65EC_gfx: - .incbin "graphics/evidence_profile_pictures/001C65EC.4bpp" + .incbin "graphics/evidence_profile_pictures/evidence/mr_monkey.4bpp" .global gUnknown_081C6E0C_pal gUnknown_081C6E0C_pal: - .incbin "graphics/evidence_profile_pictures/001C6E0C.gbapal" + .incbin "graphics/evidence_profile_pictures/evidence/codys_steel_samurai_scrapbook.gbapal" .global gUnknown_081C6E0C_gfx gUnknown_081C6E0C_gfx: - .incbin "graphics/evidence_profile_pictures/001C6E0C.4bpp" + .incbin "graphics/evidence_profile_pictures/evidence/codys_steel_samurai_scrapbook.4bpp" .global gUnknown_081C762C_pal gUnknown_081C762C_pal: - .incbin "graphics/evidence_profile_pictures/001C762C.gbapal" + .incbin "graphics/evidence_profile_pictures/evidence/global_studios_van.gbapal" .global gUnknown_081C762C_gfx gUnknown_081C762C_gfx: - .incbin "graphics/evidence_profile_pictures/001C762C.4bpp" + .incbin "graphics/evidence_profile_pictures/evidence/global_studios_van.4bpp" .global gUnknown_081C7E4C_pal gUnknown_081C7E4C_pal: - .incbin "graphics/evidence_profile_pictures/001C7E4C.gbapal" + .incbin "graphics/evidence_profile_pictures/profiles/cody_hackins.gbapal" .global gUnknown_081C7E4C_gfx gUnknown_081C7E4C_gfx: - .incbin "graphics/evidence_profile_pictures/001C7E4C.4bpp" + .incbin "graphics/evidence_profile_pictures/profiles/cody_hackins.4bpp" .global gUnknown_081C866C_pal gUnknown_081C866C_pal: - .incbin "graphics/evidence_profile_pictures/001C866C.gbapal" + .incbin "graphics/evidence_profile_pictures/profiles/will_powers.gbapal" .global gUnknown_081C866C_gfx gUnknown_081C866C_gfx: - .incbin "graphics/evidence_profile_pictures/001C866C.4bpp" + .incbin "graphics/evidence_profile_pictures/profiles/will_powers.4bpp" .global gUnknown_081C8E8C_pal gUnknown_081C8E8C_pal: - .incbin "graphics/evidence_profile_pictures/001C8E8C.gbapal" + .incbin "graphics/evidence_profile_pictures/profiles/dee_vasquez.gbapal" .global gUnknown_081C8E8C_gfx gUnknown_081C8E8C_gfx: - .incbin "graphics/evidence_profile_pictures/001C8E8C.4bpp" + .incbin "graphics/evidence_profile_pictures/profiles/dee_vasquez.4bpp" .global gUnknown_081C96AC_pal gUnknown_081C96AC_pal: - .incbin "graphics/evidence_profile_pictures/001C96AC.gbapal" + .incbin "graphics/evidence_profile_pictures/profiles/penny_nichols.gbapal" .global gUnknown_081C96AC_gfx gUnknown_081C96AC_gfx: - .incbin "graphics/evidence_profile_pictures/001C96AC.4bpp" + .incbin "graphics/evidence_profile_pictures/profiles/penny_nichols.4bpp" .global gUnknown_081C9ECC_pal gUnknown_081C9ECC_pal: - .incbin "graphics/evidence_profile_pictures/001C9ECC.gbapal" + .incbin "graphics/evidence_profile_pictures/profiles/sal_manella.gbapal" .global gUnknown_081C9ECC_gfx gUnknown_081C9ECC_gfx: - .incbin "graphics/evidence_profile_pictures/001C9ECC.4bpp" + .incbin "graphics/evidence_profile_pictures/profiles/sal_manella.4bpp" .global gUnknown_081CA6EC_pal gUnknown_081CA6EC_pal: - .incbin "graphics/evidence_profile_pictures/001CA6EC.gbapal" + .incbin "graphics/evidence_profile_pictures/profiles/jack_hammer.gbapal" .global gUnknown_081CA6EC_gfx gUnknown_081CA6EC_gfx: - .incbin "graphics/evidence_profile_pictures/001CA6EC.4bpp" + .incbin "graphics/evidence_profile_pictures/profiles/jack_hammer.4bpp" .global gUnknown_081CAF0C_pal gUnknown_081CAF0C_pal: - .incbin "graphics/evidence_profile_pictures/001CAF0C.gbapal" + .incbin "graphics/evidence_profile_pictures/profiles/wendy_oldbag.gbapal" .global gUnknown_081CAF0C_gfx gUnknown_081CAF0C_gfx: - .incbin "graphics/evidence_profile_pictures/001CAF0C.4bpp" + .incbin "graphics/evidence_profile_pictures/profiles/wendy_oldbag.4bpp" .global gUnknown_081CB72C_pal gUnknown_081CB72C_pal: - .incbin "graphics/evidence_profile_pictures/001CB72C.gbapal" + .incbin "graphics/evidence_profile_pictures/evidence/firecrackers.gbapal" .global gUnknown_081CB72C_gfx gUnknown_081CB72C_gfx: - .incbin "graphics/evidence_profile_pictures/001CB72C.4bpp" + .incbin "graphics/evidence_profile_pictures/evidence/firecrackers.4bpp" .global gUnknown_081CBF4C_pal gUnknown_081CBF4C_pal: - .incbin "graphics/evidence_profile_pictures/001CBF4C.gbapal" + .incbin "graphics/evidence_profile_pictures/evidence/pistol.gbapal" .global gUnknown_081CBF4C_gfx gUnknown_081CBF4C_gfx: - .incbin "graphics/evidence_profile_pictures/001CBF4C.4bpp" + .incbin "graphics/evidence_profile_pictures/evidence/pistol.4bpp" .global gUnknown_081CC76C_pal gUnknown_081CC76C_pal: - .incbin "graphics/evidence_profile_pictures/001CC76C.gbapal" + .incbin "graphics/evidence_profile_pictures/evidence/air_tube.gbapal" .global gUnknown_081CC76C_gfx gUnknown_081CC76C_gfx: - .incbin "graphics/evidence_profile_pictures/001CC76C.4bpp" + .incbin "graphics/evidence_profile_pictures/evidence/air_tube.4bpp" .global gUnknown_081CCF8C_pal gUnknown_081CCF8C_pal: - .incbin "graphics/evidence_profile_pictures/001CCF8C.gbapal" + .incbin "graphics/evidence_profile_pictures/evidence/metal_detector.gbapal" .global gUnknown_081CCF8C_gfx gUnknown_081CCF8C_gfx: - .incbin "graphics/evidence_profile_pictures/001CCF8C.4bpp" + .incbin "graphics/evidence_profile_pictures/evidence/metal_detector.4bpp" .global gUnknown_081CD7AC_pal gUnknown_081CD7AC_pal: - .incbin "graphics/evidence_profile_pictures/001CD7AC.gbapal" + .incbin "graphics/evidence_profile_pictures/evidence/missile.gbapal" .global gUnknown_081CD7AC_gfx gUnknown_081CD7AC_gfx: - .incbin "graphics/evidence_profile_pictures/001CD7AC.4bpp" + .incbin "graphics/evidence_profile_pictures/evidence/missile.4bpp" .global gUnknown_081CDFCC_pal gUnknown_081CDFCC_pal: - .incbin "graphics/evidence_profile_pictures/001CDFCC.gbapal" + .incbin "graphics/evidence_profile_pictures/evidence/missile_angry.gbapal" .global gUnknown_081CDFCC_gfx gUnknown_081CDFCC_gfx: - .incbin "graphics/evidence_profile_pictures/001CDFCC.4bpp" + .incbin "graphics/evidence_profile_pictures/evidence/missile_angry.4bpp" .global gUnknown_081CE7EC_pal gUnknown_081CE7EC_pal: - .incbin "graphics/evidence_profile_pictures/001CE7EC.gbapal" + .incbin "graphics/evidence_profile_pictures/evidence/dl-6_bullet.gbapal" .global gUnknown_081CE7EC_gfx gUnknown_081CE7EC_gfx: - .incbin "graphics/evidence_profile_pictures/001CE7EC.4bpp" + .incbin "graphics/evidence_profile_pictures/evidence/dl-6_bullet.4bpp" .global gUnknown_081CF00C_pal gUnknown_081CF00C_pal: - .incbin "graphics/evidence_profile_pictures/001CF00C.gbapal" + .incbin "graphics/evidence_profile_pictures/evidence/fishing_pole.gbapal" .global gUnknown_081CF00C_gfx gUnknown_081CF00C_gfx: - .incbin "graphics/evidence_profile_pictures/001CF00C.4bpp" + .incbin "graphics/evidence_profile_pictures/evidence/fishing_pole.4bpp" .global gUnknown_081CF82C_pal gUnknown_081CF82C_pal: - .incbin "graphics/evidence_profile_pictures/001CF82C.gbapal" + .incbin "graphics/evidence_profile_pictures/evidence/polly.gbapal" .global gUnknown_081CF82C_gfx gUnknown_081CF82C_gfx: - .incbin "graphics/evidence_profile_pictures/001CF82C.4bpp" + .incbin "graphics/evidence_profile_pictures/evidence/polly.4bpp" .global gUnknown_081D004C_pal gUnknown_081D004C_pal: - .incbin "graphics/evidence_profile_pictures/001D004C.gbapal" + .incbin "graphics/evidence_profile_pictures/profiles/lotta_hart.gbapal" .global gUnknown_081D004C_gfx gUnknown_081D004C_gfx: - .incbin "graphics/evidence_profile_pictures/001D004C.4bpp" + .incbin "graphics/evidence_profile_pictures/profiles/lotta_hart.4bpp" .global gUnknown_081D086C_pal gUnknown_081D086C_pal: - .incbin "graphics/evidence_profile_pictures/001D086C.gbapal" + .incbin "graphics/evidence_profile_pictures/profiles/manfred_von_karma.gbapal" .global gUnknown_081D086C_gfx gUnknown_081D086C_gfx: - .incbin "graphics/evidence_profile_pictures/001D086C.4bpp" + .incbin "graphics/evidence_profile_pictures/profiles/manfred_von_karma.4bpp" .global gUnknown_081D108C_pal gUnknown_081D108C_pal: - .incbin "graphics/evidence_profile_pictures/001D108C.gbapal" + .incbin "graphics/evidence_profile_pictures/profiles/gregory_edgeworth.gbapal" .global gUnknown_081D108C_gfx gUnknown_081D108C_gfx: - .incbin "graphics/evidence_profile_pictures/001D108C.4bpp" + .incbin "graphics/evidence_profile_pictures/profiles/gregory_edgeworth.4bpp" .global gUnknown_081D18AC_pal gUnknown_081D18AC_pal: - .incbin "graphics/evidence_profile_pictures/001D18AC.gbapal" + .incbin "graphics/evidence_profile_pictures/profiles/robert_hammond.gbapal" .global gUnknown_081D18AC_gfx gUnknown_081D18AC_gfx: - .incbin "graphics/evidence_profile_pictures/001D18AC.4bpp" + .incbin "graphics/evidence_profile_pictures/profiles/robert_hammond.4bpp" .global gUnknown_081D20CC_pal gUnknown_081D20CC_pal: - .incbin "graphics/evidence_profile_pictures/001D20CC.gbapal" + .incbin "graphics/evidence_profile_pictures/profiles/old_man.gbapal" .global gUnknown_081D20CC_gfx gUnknown_081D20CC_gfx: - .incbin "graphics/evidence_profile_pictures/001D20CC.4bpp" + .incbin "graphics/evidence_profile_pictures/profiles/old_man.4bpp" .global gUnknown_081D28EC_pal gUnknown_081D28EC_pal: - .incbin "graphics/evidence_profile_pictures/001D28EC.gbapal" + .incbin "graphics/evidence_profile_pictures/evidence/yannis_safe.gbapal" .global gUnknown_081D28EC_gfx gUnknown_081D28EC_gfx: - .incbin "graphics/evidence_profile_pictures/001D28EC.4bpp" + .incbin "graphics/evidence_profile_pictures/evidence/yannis_safe.4bpp" @ END EVIDENCE AND PROFILE PICTURES diff --git a/graphics/evidence_profile_pictures/001CC76C.png b/graphics/evidence_profile_pictures/evidence/air_tube.png similarity index 100% rename from graphics/evidence_profile_pictures/001CC76C.png rename to graphics/evidence_profile_pictures/evidence/air_tube.png diff --git a/graphics/evidence_profile_pictures/001B498C.png b/graphics/evidence_profile_pictures/evidence/article_gourdy.png similarity index 100% rename from graphics/evidence_profile_pictures/001B498C.png rename to graphics/evidence_profile_pictures/evidence/article_gourdy.png diff --git a/graphics/evidence_profile_pictures/001B51AC.png b/graphics/evidence_profile_pictures/evidence/bullet.png similarity index 100% rename from graphics/evidence_profile_pictures/001B51AC.png rename to graphics/evidence_profile_pictures/evidence/bullet.png diff --git a/graphics/evidence_profile_pictures/001BA2EC.png b/graphics/evidence_profile_pictures/evidence/cindy_stones_passport.png similarity index 100% rename from graphics/evidence_profile_pictures/001BA2EC.png rename to graphics/evidence_profile_pictures/evidence/cindy_stones_passport.png diff --git a/graphics/evidence_profile_pictures/001C456C.png b/graphics/evidence_profile_pictures/evidence/codys_digital_camera.png similarity index 100% rename from graphics/evidence_profile_pictures/001C456C.png rename to graphics/evidence_profile_pictures/evidence/codys_digital_camera.png diff --git a/graphics/evidence_profile_pictures/001C6E0C.png b/graphics/evidence_profile_pictures/evidence/codys_steel_samurai_scrapbook.png similarity index 100% rename from graphics/evidence_profile_pictures/001C6E0C.png rename to graphics/evidence_profile_pictures/evidence/codys_steel_samurai_scrapbook.png diff --git a/graphics/evidence_profile_pictures/001CE7EC.png b/graphics/evidence_profile_pictures/evidence/dl-6_bullet.png similarity index 100% rename from graphics/evidence_profile_pictures/001CE7EC.png rename to graphics/evidence_profile_pictures/evidence/dl-6_bullet.png diff --git a/graphics/evidence_profile_pictures/001C352C.png b/graphics/evidence_profile_pictures/evidence/empty_bottle.png similarity index 100% rename from graphics/evidence_profile_pictures/001C352C.png rename to graphics/evidence_profile_pictures/evidence/empty_bottle.png diff --git a/graphics/evidence_profile_pictures/001B290C.png b/graphics/evidence_profile_pictures/evidence/empty_plate.png similarity index 100% rename from graphics/evidence_profile_pictures/001B290C.png rename to graphics/evidence_profile_pictures/evidence/empty_plate.png diff --git a/graphics/evidence_profile_pictures/001CB72C.png b/graphics/evidence_profile_pictures/evidence/firecrackers.png similarity index 100% rename from graphics/evidence_profile_pictures/001CB72C.png rename to graphics/evidence_profile_pictures/evidence/firecrackers.png diff --git a/graphics/evidence_profile_pictures/001CF00C.png b/graphics/evidence_profile_pictures/evidence/fishing_pole.png similarity index 100% rename from graphics/evidence_profile_pictures/001CF00C.png rename to graphics/evidence_profile_pictures/evidence/fishing_pole.png diff --git a/graphics/evidence_profile_pictures/001BB32C.png b/graphics/evidence_profile_pictures/evidence/generic_affidavit.png similarity index 100% rename from graphics/evidence_profile_pictures/001BB32C.png rename to graphics/evidence_profile_pictures/evidence/generic_affidavit.png diff --git a/graphics/evidence_profile_pictures/001BAB0C.png b/graphics/evidence_profile_pictures/evidence/generic_autopsy_report.png similarity index 100% rename from graphics/evidence_profile_pictures/001BAB0C.png rename to graphics/evidence_profile_pictures/evidence/generic_autopsy_report.png diff --git a/graphics/evidence_profile_pictures/001B61EC.png b/graphics/evidence_profile_pictures/evidence/generic_letter.png similarity index 100% rename from graphics/evidence_profile_pictures/001B61EC.png rename to graphics/evidence_profile_pictures/evidence/generic_letter.png diff --git a/graphics/evidence_profile_pictures/001C046C.png b/graphics/evidence_profile_pictures/evidence/generic_newspaper_clipping.png similarity index 100% rename from graphics/evidence_profile_pictures/001C046C.png rename to graphics/evidence_profile_pictures/evidence/generic_newspaper_clipping.png diff --git a/graphics/evidence_profile_pictures/001B722C.png b/graphics/evidence_profile_pictures/evidence/generic_photo.png similarity index 100% rename from graphics/evidence_profile_pictures/001B722C.png rename to graphics/evidence_profile_pictures/evidence/generic_photo.png diff --git a/graphics/evidence_profile_pictures/001BFC4C.png b/graphics/evidence_profile_pictures/evidence/glass_shards.png similarity index 100% rename from graphics/evidence_profile_pictures/001BFC4C.png rename to graphics/evidence_profile_pictures/evidence/glass_shards.png diff --git a/graphics/evidence_profile_pictures/001C55AC.png b/graphics/evidence_profile_pictures/evidence/global_studios_card_key.png similarity index 100% rename from graphics/evidence_profile_pictures/001C55AC.png rename to graphics/evidence_profile_pictures/evidence/global_studios_card_key.png diff --git a/graphics/evidence_profile_pictures/001C762C.png b/graphics/evidence_profile_pictures/evidence/global_studios_van.png similarity index 100% rename from graphics/evidence_profile_pictures/001C762C.png rename to graphics/evidence_profile_pictures/evidence/global_studios_van.png diff --git a/graphics/evidence_profile_pictures/001C5DCC.png b/graphics/evidence_profile_pictures/evidence/key_to_cottage.png similarity index 100% rename from graphics/evidence_profile_pictures/001C5DCC.png rename to graphics/evidence_profile_pictures/evidence/key_to_cottage.png diff --git a/graphics/evidence_profile_pictures/001B312C.png b/graphics/evidence_profile_pictures/evidence/lottas_camera.png similarity index 100% rename from graphics/evidence_profile_pictures/001B312C.png rename to graphics/evidence_profile_pictures/evidence/lottas_camera.png diff --git a/graphics/evidence_profile_pictures/001BEC0C.png b/graphics/evidence_profile_pictures/evidence/maya_memo.png similarity index 100% rename from graphics/evidence_profile_pictures/001BEC0C.png rename to graphics/evidence_profile_pictures/evidence/maya_memo.png diff --git a/graphics/evidence_profile_pictures/001B416C.png b/graphics/evidence_profile_pictures/evidence/mayas_cellphone.png similarity index 100% rename from graphics/evidence_profile_pictures/001B416C.png rename to graphics/evidence_profile_pictures/evidence/mayas_cellphone.png diff --git a/graphics/evidence_profile_pictures/001CCF8C.png b/graphics/evidence_profile_pictures/evidence/metal_detector.png similarity index 100% rename from graphics/evidence_profile_pictures/001CCF8C.png rename to graphics/evidence_profile_pictures/evidence/metal_detector.png diff --git a/graphics/evidence_profile_pictures/001CD7AC.png b/graphics/evidence_profile_pictures/evidence/missile.png similarity index 100% rename from graphics/evidence_profile_pictures/001CD7AC.png rename to graphics/evidence_profile_pictures/evidence/missile.png diff --git a/graphics/evidence_profile_pictures/001CDFCC.png b/graphics/evidence_profile_pictures/evidence/missile_angry.png similarity index 100% rename from graphics/evidence_profile_pictures/001CDFCC.png rename to graphics/evidence_profile_pictures/evidence/missile_angry.png diff --git a/graphics/evidence_profile_pictures/001C65EC.png b/graphics/evidence_profile_pictures/evidence/mr_monkey.png similarity index 100% rename from graphics/evidence_profile_pictures/001C65EC.png rename to graphics/evidence_profile_pictures/evidence/mr_monkey.png diff --git a/graphics/evidence_profile_pictures/001B6A0C.png b/graphics/evidence_profile_pictures/evidence/note_from_the_safe.png similarity index 100% rename from graphics/evidence_profile_pictures/001B6A0C.png rename to graphics/evidence_profile_pictures/evidence/note_from_the_safe.png diff --git a/graphics/evidence_profile_pictures/001B59CC.png b/graphics/evidence_profile_pictures/evidence/phoenix_badge.png similarity index 100% rename from graphics/evidence_profile_pictures/001B59CC.png rename to graphics/evidence_profile_pictures/evidence/phoenix_badge.png diff --git a/graphics/evidence_profile_pictures/001CBF4C.png b/graphics/evidence_profile_pictures/evidence/pistol.png similarity index 100% rename from graphics/evidence_profile_pictures/001CBF4C.png rename to graphics/evidence_profile_pictures/evidence/pistol.png diff --git a/graphics/evidence_profile_pictures/001C4D8C.png b/graphics/evidence_profile_pictures/evidence/plate_with_steak_bones.png similarity index 100% rename from graphics/evidence_profile_pictures/001C4D8C.png rename to graphics/evidence_profile_pictures/evidence/plate_with_steak_bones.png diff --git a/graphics/evidence_profile_pictures/001CF82C.png b/graphics/evidence_profile_pictures/evidence/polly.png similarity index 100% rename from graphics/evidence_profile_pictures/001CF82C.png rename to graphics/evidence_profile_pictures/evidence/polly.png diff --git a/graphics/evidence_profile_pictures/001C24EC.png b/graphics/evidence_profile_pictures/evidence/steel_samurai_cards.png similarity index 100% rename from graphics/evidence_profile_pictures/001C24EC.png rename to graphics/evidence_profile_pictures/evidence/steel_samurai_cards.png diff --git a/graphics/evidence_profile_pictures/001C3D4C.png b/graphics/evidence_profile_pictures/evidence/steel_samurai_script.png similarity index 100% rename from graphics/evidence_profile_pictures/001C3D4C.png rename to graphics/evidence_profile_pictures/evidence/steel_samurai_script.png diff --git a/graphics/evidence_profile_pictures/001BF42C.png b/graphics/evidence_profile_pictures/evidence/steel_samurai_spear.png similarity index 100% rename from graphics/evidence_profile_pictures/001BF42C.png rename to graphics/evidence_profile_pictures/evidence/steel_samurai_spear.png diff --git a/graphics/evidence_profile_pictures/001C2D0C.png b/graphics/evidence_profile_pictures/evidence/steel_samurai_ultra_rare_card.png similarity index 100% rename from graphics/evidence_profile_pictures/001C2D0C.png rename to graphics/evidence_profile_pictures/evidence/steel_samurai_ultra_rare_card.png diff --git a/graphics/evidence_profile_pictures/001B9ACC.png b/graphics/evidence_profile_pictures/evidence/the_thinker.png similarity index 100% rename from graphics/evidence_profile_pictures/001B9ACC.png rename to graphics/evidence_profile_pictures/evidence/the_thinker.png diff --git a/graphics/evidence_profile_pictures/001B394C.png b/graphics/evidence_profile_pictures/evidence/wiretap.png similarity index 100% rename from graphics/evidence_profile_pictures/001B394C.png rename to graphics/evidence_profile_pictures/evidence/wiretap.png diff --git a/graphics/evidence_profile_pictures/001D28EC.png b/graphics/evidence_profile_pictures/evidence/yannis_safe.png similarity index 100% rename from graphics/evidence_profile_pictures/001D28EC.png rename to graphics/evidence_profile_pictures/evidence/yannis_safe.png diff --git a/graphics/evidence_profile_pictures/001B826C.png b/graphics/evidence_profile_pictures/profiles/april_may.png similarity index 100% rename from graphics/evidence_profile_pictures/001B826C.png rename to graphics/evidence_profile_pictures/profiles/april_may.png diff --git a/graphics/evidence_profile_pictures/001B8A8C.png b/graphics/evidence_profile_pictures/profiles/bellboy.png similarity index 100% rename from graphics/evidence_profile_pictures/001B8A8C.png rename to graphics/evidence_profile_pictures/profiles/bellboy.png diff --git a/graphics/evidence_profile_pictures/001BCB8C.png b/graphics/evidence_profile_pictures/profiles/cindy_stone.png similarity index 100% rename from graphics/evidence_profile_pictures/001BCB8C.png rename to graphics/evidence_profile_pictures/profiles/cindy_stone.png diff --git a/graphics/evidence_profile_pictures/001C7E4C.png b/graphics/evidence_profile_pictures/profiles/cody_hackins.png similarity index 100% rename from graphics/evidence_profile_pictures/001C7E4C.png rename to graphics/evidence_profile_pictures/profiles/cody_hackins.png diff --git a/graphics/evidence_profile_pictures/001C8E8C.png b/graphics/evidence_profile_pictures/profiles/dee_vasquez.png similarity index 100% rename from graphics/evidence_profile_pictures/001C8E8C.png rename to graphics/evidence_profile_pictures/profiles/dee_vasquez.png diff --git a/graphics/evidence_profile_pictures/001B7A4C.png b/graphics/evidence_profile_pictures/profiles/dick_gumshoe.png similarity index 100% rename from graphics/evidence_profile_pictures/001B7A4C.png rename to graphics/evidence_profile_pictures/profiles/dick_gumshoe.png diff --git a/graphics/evidence_profile_pictures/001BD3AC.png b/graphics/evidence_profile_pictures/profiles/frank_sahwit.png similarity index 100% rename from graphics/evidence_profile_pictures/001BD3AC.png rename to graphics/evidence_profile_pictures/profiles/frank_sahwit.png diff --git a/graphics/evidence_profile_pictures/001D108C.png b/graphics/evidence_profile_pictures/profiles/gregory_edgeworth.png similarity index 100% rename from graphics/evidence_profile_pictures/001D108C.png rename to graphics/evidence_profile_pictures/profiles/gregory_edgeworth.png diff --git a/graphics/evidence_profile_pictures/001CA6EC.png b/graphics/evidence_profile_pictures/profiles/jack_hammer.png similarity index 100% rename from graphics/evidence_profile_pictures/001CA6EC.png rename to graphics/evidence_profile_pictures/profiles/jack_hammer.png diff --git a/graphics/evidence_profile_pictures/001BC36C.png b/graphics/evidence_profile_pictures/profiles/larry_butz.png similarity index 100% rename from graphics/evidence_profile_pictures/001BC36C.png rename to graphics/evidence_profile_pictures/profiles/larry_butz.png diff --git a/graphics/evidence_profile_pictures/001D004C.png b/graphics/evidence_profile_pictures/profiles/lotta_hart.png similarity index 100% rename from graphics/evidence_profile_pictures/001D004C.png rename to graphics/evidence_profile_pictures/profiles/lotta_hart.png diff --git a/graphics/evidence_profile_pictures/001D086C.png b/graphics/evidence_profile_pictures/profiles/manfred_von_karma.png similarity index 100% rename from graphics/evidence_profile_pictures/001D086C.png rename to graphics/evidence_profile_pictures/profiles/manfred_von_karma.png diff --git a/graphics/evidence_profile_pictures/001C14AC.png b/graphics/evidence_profile_pictures/profiles/marvin_grossberg.png similarity index 100% rename from graphics/evidence_profile_pictures/001C14AC.png rename to graphics/evidence_profile_pictures/profiles/marvin_grossberg.png diff --git a/graphics/evidence_profile_pictures/001BE3EC.png b/graphics/evidence_profile_pictures/profiles/maya_fey.png similarity index 100% rename from graphics/evidence_profile_pictures/001BE3EC.png rename to graphics/evidence_profile_pictures/profiles/maya_fey.png diff --git a/graphics/evidence_profile_pictures/001BBB4C.png b/graphics/evidence_profile_pictures/profiles/mia_fey.png similarity index 100% rename from graphics/evidence_profile_pictures/001BBB4C.png rename to graphics/evidence_profile_pictures/profiles/mia_fey.png diff --git a/graphics/evidence_profile_pictures/001C1CCC.png b/graphics/evidence_profile_pictures/profiles/miles_edgeworth.png similarity index 100% rename from graphics/evidence_profile_pictures/001C1CCC.png rename to graphics/evidence_profile_pictures/profiles/miles_edgeworth.png diff --git a/graphics/evidence_profile_pictures/001C0C8C.png b/graphics/evidence_profile_pictures/profiles/misty_fey.png similarity index 100% rename from graphics/evidence_profile_pictures/001C0C8C.png rename to graphics/evidence_profile_pictures/profiles/misty_fey.png diff --git a/graphics/evidence_profile_pictures/001D20CC.png b/graphics/evidence_profile_pictures/profiles/old_man.png similarity index 100% rename from graphics/evidence_profile_pictures/001D20CC.png rename to graphics/evidence_profile_pictures/profiles/old_man.png diff --git a/graphics/evidence_profile_pictures/001C96AC.png b/graphics/evidence_profile_pictures/profiles/penny_nichols.png similarity index 100% rename from graphics/evidence_profile_pictures/001C96AC.png rename to graphics/evidence_profile_pictures/profiles/penny_nichols.png diff --git a/graphics/evidence_profile_pictures/001B92AC.png b/graphics/evidence_profile_pictures/profiles/redd_white.png similarity index 100% rename from graphics/evidence_profile_pictures/001B92AC.png rename to graphics/evidence_profile_pictures/profiles/redd_white.png diff --git a/graphics/evidence_profile_pictures/001D18AC.png b/graphics/evidence_profile_pictures/profiles/robert_hammond.png similarity index 100% rename from graphics/evidence_profile_pictures/001D18AC.png rename to graphics/evidence_profile_pictures/profiles/robert_hammond.png diff --git a/graphics/evidence_profile_pictures/001C9ECC.png b/graphics/evidence_profile_pictures/profiles/sal_manella.png similarity index 100% rename from graphics/evidence_profile_pictures/001C9ECC.png rename to graphics/evidence_profile_pictures/profiles/sal_manella.png diff --git a/graphics/evidence_profile_pictures/001CAF0C.png b/graphics/evidence_profile_pictures/profiles/wendy_oldbag.png similarity index 100% rename from graphics/evidence_profile_pictures/001CAF0C.png rename to graphics/evidence_profile_pictures/profiles/wendy_oldbag.png diff --git a/graphics/evidence_profile_pictures/001C866C.png b/graphics/evidence_profile_pictures/profiles/will_powers.png similarity index 100% rename from graphics/evidence_profile_pictures/001C866C.png rename to graphics/evidence_profile_pictures/profiles/will_powers.png diff --git a/graphics/evidence_profile_pictures/001BDBCC.png b/graphics/evidence_profile_pictures/profiles/winston_payne.png similarity index 100% rename from graphics/evidence_profile_pictures/001BDBCC.png rename to graphics/evidence_profile_pictures/profiles/winston_payne.png From 78d9828203104a29596dd752a0489c55653892c8 Mon Sep 17 00:00:00 2001 From: Missingmew Date: Fri, 1 Sep 2023 21:39:34 +0200 Subject: [PATCH 03/17] fix warning (treated as error) in gbagfx --- tools/gbagfx/gfx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/gbagfx/gfx.c b/tools/gbagfx/gfx.c index c74a07e..4788201 100644 --- a/tools/gbagfx/gfx.c +++ b/tools/gbagfx/gfx.c @@ -666,7 +666,7 @@ void WriteStripedImage(char *path, int numTiles, int bitDepth, int metatileWidth unsigned char *copFileBuf = fileBuffer; unsigned char *copyPalBuf = paletteBuf; - unsigned int prevOffset; + unsigned int prevOffset = 0; unsigned int *buf = (unsigned int *)copFileBuf; From d37bb146aa703f04da7e7276f3715fbe2400a718 Mon Sep 17 00:00:00 2001 From: Missingmew Date: Fri, 1 Sep 2023 21:42:58 +0200 Subject: [PATCH 04/17] massively simplify graphics.mk --- graphics.mk | 433 +--------------------------------------------------- 1 file changed, 2 insertions(+), 431 deletions(-) diff --git a/graphics.mk b/graphics.mk index 019997e..de89393 100644 --- a/graphics.mk +++ b/graphics.mk @@ -1,435 +1,7 @@ EVIDENCE_PROFILE_DESCRIPTIONS := graphics/evidence_profile_descriptions -$(EVIDENCE_PROFILE_DESCRIPTIONS)/00196CA8.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/00196CA8.png +$(EVIDENCE_PROFILE_DESCRIPTIONS)/%.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/%.png $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/00196CA8.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/00196CA8.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001970DC.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001970DC.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001970DC.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001970DC.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/00197514.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/00197514.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/00197514.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/00197514.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/00197928.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/00197928.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/00197928.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/00197928.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/00197D18.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/00197D18.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/00197D18.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/00197D18.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001981A0.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001981A0.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001981A0.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001981A0.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001985D8.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001985D8.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001985D8.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001985D8.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/00198A84.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/00198A84.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/00198A84.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/00198A84.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/00198E5C.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/00198E5C.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/00198E5C.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/00198E5C.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/00199228.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/00199228.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/00199228.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/00199228.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/00199690.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/00199690.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/00199690.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/00199690.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/00199AEC.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/00199AEC.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/00199AEC.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/00199AEC.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/00199EC8.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/00199EC8.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/00199EC8.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/00199EC8.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/0019A2E4.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/0019A2E4.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/0019A2E4.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/0019A2E4.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/0019A700.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/0019A700.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/0019A700.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/0019A700.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/0019ABBC.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/0019ABBC.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/0019ABBC.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/0019ABBC.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/0019B028.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/0019B028.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/0019B028.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/0019B028.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/0019B428.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/0019B428.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/0019B428.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/0019B428.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/0019B868.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/0019B868.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/0019B868.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/0019B868.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/0019BCE4.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/0019BCE4.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/0019BCE4.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/0019BCE4.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/0019C0D8.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/0019C0D8.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/0019C0D8.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/0019C0D8.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/0019C434.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/0019C434.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/0019C434.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/0019C434.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/0019C810.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/0019C810.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/0019C810.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/0019C810.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/0019CC44.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/0019CC44.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/0019CC44.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/0019CC44.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/0019D028.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/0019D028.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/0019D028.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/0019D028.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/0019D4C8.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/0019D4C8.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/0019D4C8.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/0019D4C8.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/0019D90C.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/0019D90C.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/0019D90C.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/0019D90C.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/0019DDAC.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/0019DDAC.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/0019DDAC.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/0019DDAC.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/0019E18C.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/0019E18C.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/0019E18C.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/0019E18C.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/0019E5A0.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/0019E5A0.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/0019E5A0.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/0019E5A0.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/0019E9D8.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/0019E9D8.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/0019E9D8.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/0019E9D8.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/0019EDF0.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/0019EDF0.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/0019EDF0.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/0019EDF0.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/0019F208.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/0019F208.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/0019F208.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/0019F208.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/0019F5C0.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/0019F5C0.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/0019F5C0.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/0019F5C0.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/0019F9E8.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/0019F9E8.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/0019F9E8.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/0019F9E8.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/0019FD84.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/0019FD84.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/0019FD84.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/0019FD84.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A0120.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A0120.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A0120.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A0120.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A0580.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A0580.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A0580.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A0580.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A09E4.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A09E4.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A09E4.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A09E4.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A0E58.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A0E58.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A0E58.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A0E58.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A1324.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A1324.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A1324.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A1324.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A1728.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A1728.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A1728.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A1728.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A1A10.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A1A10.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A1A10.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A1A10.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A1E1C.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A1E1C.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A1E1C.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A1E1C.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A22A4.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A22A4.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A22A4.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A22A4.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A26BC.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A26BC.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A26BC.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A26BC.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A2AE4.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A2AE4.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A2AE4.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A2AE4.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A2EE4.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A2EE4.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A2EE4.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A2EE4.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A3330.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A3330.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A3330.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A3330.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A3714.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A3714.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A3714.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A3714.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A3B44.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A3B44.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A3B44.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A3B44.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A3FF8.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A3FF8.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A3FF8.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A3FF8.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A439C.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A439C.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A439C.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A439C.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A47D4.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A47D4.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A47D4.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A47D4.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A4BD4.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A4BD4.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A4BD4.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A4BD4.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A4FF0.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A4FF0.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A4FF0.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A4FF0.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A541C.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A541C.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A541C.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A541C.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A5828.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A5828.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A5828.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A5828.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A5BF4.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A5BF4.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A5BF4.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A5BF4.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A5FA4.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A5FA4.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A5FA4.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A5FA4.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A639C.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A639C.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A639C.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A639C.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A675C.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A675C.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A675C.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A675C.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A6B88.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A6B88.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A6B88.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A6B88.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A6F68.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A6F68.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A6F68.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A6F68.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A7310.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A7310.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A7310.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A7310.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A775C.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A775C.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A775C.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A775C.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A7B68.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A7B68.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A7B68.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A7B68.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A7FA4.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A7FA4.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A7FA4.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A7FA4.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A83C4.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A83C4.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A83C4.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A83C4.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A8828.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A8828.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A8828.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A8828.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A8C30.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A8C30.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A8C30.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A8C30.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A8F4C.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A8F4C.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A8F4C.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A8F4C.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A9380.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A9380.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A9380.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A9380.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A97CC.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A97CC.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A97CC.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A97CC.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A9BC8.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A9BC8.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001A9BC8.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001A9BC8.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001AA054.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001AA054.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001AA054.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001AA054.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001AA458.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001AA458.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001AA458.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001AA458.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001AA894.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001AA894.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001AA894.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001AA894.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001AACDC.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001AACDC.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001AACDC.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001AACDC.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001AB178.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001AB178.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001AB178.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001AB178.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001AB574.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001AB574.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001AB574.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001AB574.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001AB9FC.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001AB9FC.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001AB9FC.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001AB9FC.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001ABE00.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001ABE00.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001ABE00.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001ABE00.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001AC2B0.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001AC2B0.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001AC2B0.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001AC2B0.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001AC75C.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001AC75C.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001AC75C.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001AC75C.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001ACBFC.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001ACBFC.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001ACBFC.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001ACBFC.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001AD02C.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001AD02C.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001AD02C.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001AD02C.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001AD448.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001AD448.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001AD448.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001AD448.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001AD864.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001AD864.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001AD864.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001AD864.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001ADCD4.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001ADCD4.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001ADCD4.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001ADCD4.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001AE0DC.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001AE0DC.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001AE0DC.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001AE0DC.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001AE4FC.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001AE4FC.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001AE4FC.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001AE4FC.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001AE938.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001AE938.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001AE938.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001AE938.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001AED3C.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001AED3C.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001AED3C.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001AED3C.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001AF15C.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001AF15C.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001AF15C.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001AF15C.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001AF5A8.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001AF5A8.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001AF5A8.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001AF5A8.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001AF9DC.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001AF9DC.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001AF9DC.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001AF9DC.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001AFE0C.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001AFE0C.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001AFE0C.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001AFE0C.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001B01D0.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001B01D0.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001B01D0.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001B01D0.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001B0594.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001B0594.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001B0594.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001B0594.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001B0984.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001B0984.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001B0984.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001B0984.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001B0DC4.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001B0DC4.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001B0DC4.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001B0DC4.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001B1150.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001B1150.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001B1150.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001B1150.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001B14EC.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001B14EC.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001B14EC.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001B14EC.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001B18C0.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001B18C0.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001B18C0.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001B18C0.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001B1CBC.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001B1CBC.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001B1CBC.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001B1CBC.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001B2150.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001B2150.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001B2150.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001B2150.4bpp - $(GBAGFX) $< $@ -search 8 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001B25F0.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001B25F0.png - $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVIDENCE_PROFILE_DESCRIPTIONS)/001B25F0.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/001B25F0.4bpp +$(EVIDENCE_PROFILE_DESCRIPTIONS)/%.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/%.4bpp $(GBAGFX) $< $@ -search 8 LOCATION_CHOICES := graphics/location_choices @@ -441,7 +13,6 @@ $(LOCATION_CHOICES)/%.4bpp: $(LOCATION_CHOICES)/%.png $(TALK_CHOICES)/%.4bpp: $(TALK_CHOICES)/%.png $(GBAGFX) $< $@ -mwidth 8 -mheight 4 - graphics/title_screen.8bpp.lz: graphics/title_screen.8bpp $(GBAGFX) $< $@ -search 8 graphics/title_screen_demo.8bpp.lz: graphics/title_screen_demo.8bpp From f8caa31a4528e52f689e59bd7e3278bc7f4ddfc1 Mon Sep 17 00:00:00 2001 From: Missingmew Date: Fri, 1 Sep 2023 22:27:34 +0200 Subject: [PATCH 05/17] save until here --- data/graphics.s | 736 +++++++++--------- graphics.mk | 12 + .../evidence/dl6_case_file_page_1.png} | Bin .../evidence/dl6_case_file_page_2.png} | Bin .../evidence/dl6_case_file_page_3.png} | Bin include/constants/animations | 0 include/graphics.h | 704 ++++++++--------- src/bg3.c | 14 +- src/court.c | 16 +- src/court_record.c | 26 +- src/data/background.h | 224 +++--- src/episode_load_processes.c | 32 +- src/gameover_process.c | 8 +- src/investigation.c | 54 +- src/save_processes.c | 14 +- src/script_commands2.c | 38 +- src/script_commands3.c | 18 +- src/title_processes.c | 6 +- 18 files changed, 957 insertions(+), 945 deletions(-) rename graphics/striped_images/{3A6934.png => backgrounds/evidence/dl6_case_file_page_1.png} (100%) rename graphics/striped_images/{3A7790.png => backgrounds/evidence/dl6_case_file_page_2.png} (100%) rename graphics/striped_images/{3A8648.png => backgrounds/evidence/dl6_case_file_page_3.png} (100%) delete mode 100644 include/constants/animations diff --git a/data/graphics.s b/data/graphics.s index f6190b7..a77e581 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -1,16 +1,16 @@ .section gfx_data, "aw", %progbits .include "asm/macros.inc" - .global gGfxPalTitleScreen -gGfxPalTitleScreen: + .global gPalTitleScreen +gPalTitleScreen: .incbin "graphics/title_screen.gbapal" .global gGfx8lzTitleScreen gGfx8lzTitleScreen: .incbin "graphics/title_screen.8bpp.lz" - .global gGfxPalTitleScreenDemo -gGfxPalTitleScreenDemo: + .global gPalTitleScreenDemo +gPalTitleScreenDemo: .incbin "graphics/title_screen_demo.gbapal" .global gGfx8lzTitleScreenDemo @@ -21,8 +21,8 @@ gGfx8lzTitleScreenDemo: gUnusedAsciiCharSet: .incbin "graphics/unused_ascii_charset.4bpp" - .global gGfxPalEvidenceProfileDesc -gGfxPalEvidenceProfileDesc: + .global gPalEvidenceProfileDesc +gPalEvidenceProfileDesc: .incbin "graphics/evidence_profile_descriptions/evidence_profile_descriptions.gbapal" .global gUnknown_08186540 @@ -61,87 +61,87 @@ gGfx4bppInvestigationScrollButton: gGfx4bppTestimonyTextTiles: .incbin "graphics/ui/trial/testimony_text_tiles.4bpp" - .global gUnknown_081900C0 -gUnknown_081900C0: + .global gGfxTrialPressPresentButtons +gGfxTrialPressPresentButtons: .incbin "graphics/ui/trial/press_present_buttons.4bpp" - .global gUnknown_081904C0 -gUnknown_081904C0: + .global gGfxCourtRecordPresentBackText +gGfxCourtRecordPresentBackText: .incbin "graphics/ui/court_record/present_back_text.4bpp" - .global gUnknown_081906C0 -gUnknown_081906C0: + .global gGfxCourtRecordProfilesText +gGfxCourtRecordProfilesText: .incbin "graphics/ui/court_record/profiles_text.4bpp" - .global gUnknown_081908C0 -gUnknown_081908C0: + .global gGfxCourtRecordEvidenceText +gGfxCourtRecordEvidenceText: .incbin "graphics/ui/court_record/evidence_text.4bpp" - .global gUnknown_08190AC0 -gUnknown_08190AC0: + .global gGfxInvestigationExamineCursor +gGfxInvestigationExamineCursor: .incbin "graphics/ui/investigation/examine_cursor.4bpp" - .global gUnknown_08190FC0 -gUnknown_08190FC0: + .global gGfxInvestigationCheckmark +gGfxInvestigationCheckmark: .incbin "graphics/ui/investigation/checkmark.4bpp" - .global gUnknown_081911C0 -gUnknown_081911C0: + .global gGfxTrialGameOverDoors +gGfxTrialGameOverDoors: .incbin "graphics/ui/trial/game_over_doors.4bpp" - .global gUnknown_081914A0 -gUnknown_081914A0: + .global gGfxTrialNotGuilty1 +gGfxTrialNotGuilty1: .incbin "graphics/ui/trial/not_guilty1.4bpp" - .global gUnknown_08191CA0 -gUnknown_08191CA0: + .global gGfxTrialGuilty1 +gGfxTrialGuilty1: .incbin "graphics/ui/trial/guilty1.4bpp" - .global gUnknown_081924A0 -gUnknown_081924A0: + .global gGfxTrialGuiltyNotGuilty2 +gGfxTrialGuiltyNotGuilty2: .incbin "graphics/ui/trial/guilty_not_guilty2.4bpp" - .global gUnknown_08192CA0 -gUnknown_08192CA0: + .global gGfxTrialGameOverText +gGfxTrialGameOverText: .incbin "graphics/ui/trial/game_over_text.4bpp" - .global gUnknown_08193CA0 -gUnknown_08193CA0: + .global gGfxNewGameContinue +gGfxNewGameContinue: .incbin "graphics/ui/new_game_continue.4bpp" - .global gUnknown_081940A0 -gUnknown_081940A0: + .global gGfxTrialConfetti +gGfxTrialConfetti: .incbin "graphics/ui/trial/confetti.4bpp" .incbin "graphics/unk_1940C0.gbapal" - .global gUnknown_081940E0 -gUnknown_081940E0: + .global gPalCrossExaminationUI +gPalCrossExaminationUI: .incbin "graphics/ui/cross_examination_ui.gbapal" .incbin "graphics/unk_194100.gbapal" - .global gUnknown_08194200 -gUnknown_08194200: + .global gPalActionButtons +gPalActionButtons: .incbin "graphics/ui/investigation/action_buttons_0.gbapal" .incbin "graphics/ui/investigation/action_buttons_1.gbapal" - .global gUnknown_08194240 -gUnknown_08194240: + .global gPalCourtRecordControlsBlurb +gPalCourtRecordControlsBlurb: .incbin "graphics/ui/court_record/controls_blurb.gbapal" - .global gUnknown_08194260 -gUnknown_08194260: + .global gPalInvestigationScrollPrompt +gPalInvestigationScrollPrompt: .incbin "graphics/ui/investigation/scroll_prompt.gbapal" - .global gUnknown_08194280 -gUnknown_08194280: + .global gPalTrialTestimonyTextTiles +gPalTrialTestimonyTextTiles: .incbin "graphics/ui/trial/testimony_text_tiles.gbapal" - .global gUnknown_081942A0 -gUnknown_081942A0: + .global gPalTrialPressPresentButtons +gPalTrialPressPresentButtons: .incbin "graphics/ui/trial/press_present_buttons.gbapal" - .global gUnknown_081942C0 -gUnknown_081942C0: + .global gPalInvestigationExamineCursors +gPalInvestigationExamineCursors: .incbin "graphics/ui/investigation/examine_cursor_00.gbapal" .incbin "graphics/ui/investigation/examine_cursor_01.gbapal" .incbin "graphics/ui/investigation/examine_cursor_02.gbapal" @@ -160,28 +160,28 @@ gUnknown_081942C0: .incbin "graphics/ui/investigation/examine_cursor_15.gbapal" .incbin "graphics/ui/investigation/examine_cursor_16.gbapal" - .global gUnknown_081944E0 -gUnknown_081944E0: + .global gPalInvestigationCheckmark +gPalInvestigationCheckmark: .incbin "graphics/ui/investigation/checkmark.gbapal" - .global gUnknown_08194500 -gUnknown_08194500: + .global gPalTrialGameOverDoors +gPalTrialGameOverDoors: .incbin "graphics/ui/trial/game_over_doors.gbapal" - .global gUnknown_08194520 -gUnknown_08194520: + .global gPalTrialGuilty +gPalTrialGuilty: .incbin "graphics/ui/trial/guilty.gbapal" - .global gUnknown_08194540 -gUnknown_08194540: + .global gPalTrialNotGuilty +gPalTrialNotGuilty: .incbin "graphics/ui/trial/not_guilty.gbapal" - .global gUnknown_08194560 -gUnknown_08194560: + .global gPalTrialGameOverText +gPalTrialGameOverText: .incbin "graphics/ui/trial/game_over_text.gbapal" - .global gUnknown_08194580 -gUnknown_08194580: + .global gPalNewGameContinue +gPalNewGameContinue: .incbin "graphics/ui/new_game_continue_0.gbapal" .incbin "graphics/ui/new_game_continue_1.gbapal" .incbin "graphics/ui/new_game_continue_2.gbapal" @@ -189,23 +189,23 @@ gUnknown_08194580: .incbin "graphics/ui/new_game_continue_4.gbapal" .incbin "graphics/ui/new_game_continue_5.gbapal" - .global gUnknown_08194640 -gUnknown_08194640: + .global gPalConfetti +gPalConfetti: .incbin "graphics/ui/trial/confetti_0.gbapal" .incbin "graphics/ui/trial/confetti_1.gbapal" .incbin "graphics/ui/trial/confetti_2.gbapal" .incbin "graphics/ui/trial/confetti_3.gbapal" - .global gUnknown_081946C0 -gUnknown_081946C0: + .global gGfx4lzEpisodeSelectOptions +gGfx4lzEpisodeSelectOptions: .incbin "graphics/episode_select_options.4bpp.lz" - .global gUnknown_081954A8 -gUnknown_081954A8: + .global gGfxFromSaveOrBeginning +gGfxFromSaveOrBeginning: .incbin "graphics/from_save_or_beginning_options.4bpp" - .global gUnknown_081964A8 -gUnknown_081964A8: + .global gGfxSaveYesOrNo +gGfxSaveYesOrNo: .incbin "graphics/save_yes_no.4bpp" @ BEGIN PROFILE AND EVIDENCE DESCRIPTIONS @@ -646,55 +646,55 @@ gUnknown_081B25F0: @ BEGIN EVIDENCE AND PROFILE PICTURES - .global gUnknown_081B290C -gUnknown_081B290C: + .global gGfxEvidenceProfilePictures +gGfxEvidenceProfilePictures: - .global gUnknown_081B290C_pal -gUnknown_081B290C_pal: + .global gPalEvidenceEmptyPlate +gPalEvidenceEmptyPlate: .incbin "graphics/evidence_profile_pictures/evidence/empty_plate.gbapal" - .global gUnknown_081B290C_gfx -gUnknown_081B290C_gfx: + .global gGfxEvidenceEmptyPlate +gGfxEvidenceEmptyPlate: .incbin "graphics/evidence_profile_pictures/evidence/empty_plate.4bpp" - .global gUnknown_081B312C_pal -gUnknown_081B312C_pal: + .global gPalEvidenceLottasCamera +gPalEvidenceLottasCamera: .incbin "graphics/evidence_profile_pictures/evidence/lottas_camera.gbapal" - .global gUnknown_081B312C_gfx -gUnknown_081B312C_gfx: + .global gGfxEvidenceLottasCamera +gGfxEvidenceLottasCamera: .incbin "graphics/evidence_profile_pictures/evidence/lottas_camera.4bpp" - .global gUnknown_081B394C_pal -gUnknown_081B394C_pal: + .global gPalEvidenceWiretap +gPalEvidenceWiretap: .incbin "graphics/evidence_profile_pictures/evidence/wiretap.gbapal" - .global gUnknown_081B394C_gfx -gUnknown_081B394C_gfx: + .global gGfxEvidenceWiretap +gGfxEvidenceWiretap: .incbin "graphics/evidence_profile_pictures/evidence/wiretap.4bpp" - .global gUnknown_081B416C_pal -gUnknown_081B416C_pal: + .global gPalEvidenceMayasCellphone +gPalEvidenceMayasCellphone: .incbin "graphics/evidence_profile_pictures/evidence/mayas_cellphone.gbapal" - .global gUnknown_081B416C_gfx -gUnknown_081B416C_gfx: + .global gGfxEvidenceMayasCellphone +gGfxEvidenceMayasCellphone: .incbin "graphics/evidence_profile_pictures/evidence/mayas_cellphone.4bpp" - .global gUnknown_081B498C_pal -gUnknown_081B498C_pal: + .global gPalEvidenceArticleGourdy +gPalEvidenceArticleGourdy: .incbin "graphics/evidence_profile_pictures/evidence/article_gourdy.gbapal" - .global gUnknown_081B498C_gfx -gUnknown_081B498C_gfx: + .global gGfxEvidenceArticleGourdy +gGfxEvidenceArticleGourdy: .incbin "graphics/evidence_profile_pictures/evidence/article_gourdy.4bpp" - .global gUnknown_081B51AC_pal -gUnknown_081B51AC_pal: + .global gPalEvidenceBullet +gPalEvidenceBullet: .incbin "graphics/evidence_profile_pictures/evidence/bullet.gbapal" - .global gUnknown_081B51AC_gfx -gUnknown_081B51AC_gfx: + .global gGfxEvidenceBullet +gGfxEvidenceBullet: .incbin "graphics/evidence_profile_pictures/evidence/bullet.4bpp" .global gUnknown_081B59CC_pal @@ -1173,18 +1173,18 @@ gCharSet: @ Charset @ BEGIN TALK AND LOCATION CHOICES - .global gGfxPalChoiceSelected -gGfxPalChoiceSelected: + .global gPalChoiceSelected +gPalChoiceSelected: .incbin "graphics/choice_selected.gbapal" - .global gGfxPalChoiceGreyedOut -gGfxPalChoiceGreyedOut: + .global gPalChoiceGreyedOut +gPalChoiceGreyedOut: .incbin "graphics/choice_greyed_out.gbapal" @ first block of stuffs - .global gUnknown_081FD96C -gUnknown_081FD96C: + .global gGfxLocationChoices +gGfxLocationChoices: .incbin "graphics/location_choices/001FD96C.4bpp" .incbin "graphics/location_choices/001FE16C.4bpp" .incbin "graphics/location_choices/001FE96C.4bpp" @@ -1209,8 +1209,8 @@ gUnknown_081FD96C: @ second block of stuffs - .global gUnknown_0820816C -gUnknown_0820816C: + .global gGfxTalkChoices +gGfxTalkChoices: .incbin "graphics/talk_choices/0020816C.4bpp" .incbin "graphics/talk_choices/0020896C.4bpp" .incbin "graphics/talk_choices/0020916C.4bpp" @@ -1339,595 +1339,595 @@ gUnknown_0820816C: @ END TALK AND LOCATION CHOICES - .global gUnknown_0824696C -gUnknown_0824696C: + .global gPalMapMarkersPalette +gPalMapMarkersPalette: .incbin "graphics/map_markers/palette.gbapal" - .global gUnknown_0824698C -gUnknown_0824698C: + .global gGfxMapMarkersKiller +gGfxMapMarkersKiller: .incbin "graphics/map_markers/killer.4bpp" - .global gUnknown_08246A0C -gUnknown_08246A0C: + .global gGfxMapMarkersVictim +gGfxMapMarkersVictim: .incbin "graphics/map_markers/victim.4bpp" - .global gUnknown_08246A8C -gUnknown_08246A8C: + .global gGfxMapMarkersCase2MiaBody +gGfxMapMarkersCase2MiaBody: .incbin "graphics/map_markers/case2_mia_body.4bpp" - .global gUnknown_08246E8C -gUnknown_08246E8C: + .global gGfxMapMarkersCase2Thinker +gGfxMapMarkersCase2Thinker: .incbin "graphics/map_markers/case2_thinker.4bpp" - .global gUnknown_08246ECC -gUnknown_08246ECC: + .global gGfxMapMarkersCase3Studio1 +gGfxMapMarkersCase3Studio1: .incbin "graphics/map_markers/case3_studio_1.4bpp" - .global gUnknown_082476CC -gUnknown_082476CC: + .global gGfxMapMarkersCase3Studio2 +gGfxMapMarkersCase3Studio2: .incbin "graphics/map_markers/case3_studio_2.4bpp" - .global gUnknown_08247ECC -gUnknown_08247ECC: + .global gGfxMapMarkersCase3EmployeeArea +gGfxMapMarkersCase3EmployeeArea: .incbin "graphics/map_markers/case3_employee_area.4bpp" - .global gUnknown_082486CC -gUnknown_082486CC: + .global gGfxMapMarkersCase3Gate +gGfxMapMarkersCase3Gate: .incbin "graphics/map_markers/case3_gate.4bpp" - .global gUnknown_0824874C -gUnknown_0824874C: + .global gGfxMapMarkersCase3MainGate +gGfxMapMarkersCase3MainGate: .incbin "graphics/map_markers/case3_main_gate.4bpp" - .global gUnknown_0824884C -gUnknown_0824884C: + .global gGfxMapMarkersGreen +gGfxMapMarkersGreen: .incbin "graphics/map_markers/green.4bpp" - .global gUnknown_082488CC -gUnknown_082488CC: + .global gGfxMapMarkersCase4BoatHorizontal +gGfxMapMarkersCase4BoatHorizontal: .incbin "graphics/map_markers/case4_boat_horizontal.4bpp" - .global gUnknown_0824890C -gUnknown_0824890C: + .global gGfxMapMarkersCase4BoatRentalShop +gGfxMapMarkersCase4BoatRentalShop: .incbin "graphics/map_markers/case4_boat_rental_shop.4bpp" - .global gUnknown_08248B0C -gUnknown_08248B0C: + .global gGfxMapMarkersCase4LottaSuv +gGfxMapMarkersCase4LottaSuv: .incbin "graphics/map_markers/case4_lotta_suv.4bpp" - .global gUnknown_08248C0C -gUnknown_08248C0C: + .global gGfxMapMarkersCase4BoatVertical +gGfxMapMarkersCase4BoatVertical: .incbin "graphics/map_markers/case4_boat_vertical.4bpp" @ ; BEGIN BACKGROUNDS - .global gGfx_BG000 -gGfx_BG000: + .global gGfx_BG000_FeyCoMurderNight +gGfx_BG000_FeyCoMurderNight: .incbin "graphics/striped_images/backgrounds/wright_co_law_offices/fey_co_murder_night.8bpp.striped" - .global gGfx_BG001 -gGfx_BG001: + .global gGfx_BG001_WrightCoOfficeDay +gGfx_BG001_WrightCoOfficeDay: .incbin "graphics/striped_images/backgrounds/wright_co_law_offices/office_day.8bpp.striped" - .global gGfx_BG002 -gGfx_BG002: + .global gGfx_BG002_CourtDefendantLobby +gGfx_BG002_CourtDefendantLobby: .incbin "graphics/striped_images/backgrounds/court/defendant_lobby.8bpp.striped" - .global gGfx_BG003 -gGfx_BG003: + .global gGfx_BG003_CourtDefenseBench +gGfx_BG003_CourtDefenseBench: .incbin "graphics/striped_images/backgrounds/court/defense_bench.4bpp.striped" - .global gGfx_BG004 -gGfx_BG004: + .global gGfx_BG004_CourtProsecutionBench +gGfx_BG004_CourtProsecutionBench: .incbin "graphics/striped_images/backgrounds/court/prosecution_bench.4bpp.striped" - .global gGfx_BG005 -gGfx_BG005: + .global gGfx_BG005_CourtWitnessStand +gGfx_BG005_CourtWitnessStand: .incbin "graphics/striped_images/backgrounds/court/witness_stand.4bpp.striped" - .global gGfx_BG006 -gGfx_BG006: + .global gGfx_BG006_CourtRoom +gGfx_BG006_CourtRoom: .incbin "graphics/striped_images/backgrounds/court/court_room.8bpp.striped" - .global gGfx_BG007 -gGfx_BG007: + .global gGfx_BG007_CourtCoCounsel +gGfx_BG007_CourtCoCounsel: .incbin "graphics/striped_images/backgrounds/court/co_counsel.8bpp.striped" - .global gGfx_BG008 -gGfx_BG008: + .global gGfx_BG008_CourtJudgeSeat +gGfx_BG008_CourtJudgeSeat: .incbin "graphics/striped_images/backgrounds/court/judge_seat.8bpp.striped" - .global gGfx_BG009 -gGfx_BG009: + .global gGfx_BG009_FeyCoEntranceNight +gGfx_BG009_FeyCoEntranceNight: .incbin "graphics/striped_images/backgrounds/wright_co_law_offices/office_entry_night.8bpp.striped" - .global gGfx_BG010 -gGfx_BG010: + .global gGfx_BG010_Case2MayaSeeingDeadMia +gGfx_BG010_Case2MayaSeeingDeadMia: .incbin "graphics/striped_images/backgrounds/cutscenes/case2/maya_seeing_dead_mia.8bpp.striped" - .global gGfx_BG011 -gGfx_BG011: + .global gGfx_BG011_GlobalStudiosStudioPath +gGfx_BG011_GlobalStudiosStudioPath: .incbin "graphics/striped_images/backgrounds/global_studios/studio_path.8bpp.striped" - .global gGfx_BG012 -gGfx_BG012: + .global gGfx_BG012_GlobalStudiosStaffArea +gGfx_BG012_GlobalStudiosStaffArea: .incbin "graphics/striped_images/backgrounds/global_studios/staff_area.8bpp.striped" - .global gGfx_BG013 -gGfx_BG013: + .global gGfx_BG013_WitnessMiaDodgingRight +gGfx_BG013_WitnessMiaDodgingRight: .incbin "graphics/striped_images/backgrounds/witness_account/mia_dodging_right.4bpp.striped" - .global gGfx_BG014 -gGfx_BG014: + .global gGfx_BG014_WitnessMiaDodgingLeft +gGfx_BG014_WitnessMiaDodgingLeft: .incbin "graphics/striped_images/backgrounds/witness_account/mia_dodging_left.4bpp.striped" - .global gGfx_BG015 -gGfx_BG015: + .global gGfx_BG015_EvidenceFeyCoDiagram +gGfx_BG015_EvidenceFeyCoDiagram: .incbin "graphics/striped_images/backgrounds/evidence/fey_co_diagram.4bpp.striped" - .global gGfx_BG016 -gGfx_BG016: + .global gGfx_BG016_WitnessAprilGettingRoomService +gGfx_BG016_WitnessAprilGettingRoomService: .incbin "graphics/striped_images/backgrounds/witness_account/april_getting_room_service.4bpp.striped" - .global gGfx_BG017 -gGfx_BG017: + .global gGfx_BG017_Case2MiaDeadOnGround +gGfx_BG017_Case2MiaDeadOnGround: .incbin "graphics/striped_images/backgrounds/wright_co_law_offices/mia_dead_on_ground.8bpp.striped" - .global gGfx_BG018 -gGfx_BG018: + .global gGfx_BG018_Case2PhoenixMayaMia +gGfx_BG018_Case2PhoenixMayaMia: .incbin "graphics/striped_images/backgrounds/cutscenes/case2/phoenix_maya_mia.8bpp.striped" - .global gGfx_BG019 -gGfx_BG019: + .global gGfx_BG019_GlobalStudiosStudio2Trailer +gGfx_BG019_GlobalStudiosStudio2Trailer: .incbin "graphics/striped_images/backgrounds/global_studios/studio_2_trailer.8bpp.striped" - .global gGfx_BG020 -gGfx_BG020: + .global gGfx_BG020_Case2AprilCallingPolice +gGfx_BG020_Case2AprilCallingPolice: .incbin "graphics/striped_images/backgrounds/cutscenes/case2/april_calling_police.8bpp.striped" - .global gGfx_BG021 -gGfx_BG021: + .global gGfx_BG021_Case2ReddHittingMia +gGfx_BG021_Case2ReddHittingMia: .incbin "graphics/striped_images/backgrounds/cutscenes/case2/redd_hitting_mia.8bpp.striped" - .global gGfx_BG022 -gGfx_BG022: + .global gGfx_BG022_Case2MiaBeingAttacked +gGfx_BG022_Case2MiaBeingAttacked: .incbin "graphics/striped_images/backgrounds/cutscenes/case2/mia_being_attacked.8bpp.striped" - .global gGfx_BG023 -gGfx_BG023: + .global gGfx_BG023_Case2ReddHoldingThinker +gGfx_BG023_Case2ReddHoldingThinker: .incbin "graphics/striped_images/backgrounds/cutscenes/case2/redd_holding_thinker.4bpp.striped" - .global gGfx_BG024 -gGfx_BG024: + .global gGfx_BG024_GlobalStudiosDressingRoom +gGfx_BG024_GlobalStudiosDressingRoom: .incbin "graphics/striped_images/backgrounds/global_studios/will_power_dressing_room.8bpp.striped" - .global gGfx_BG025 -gGfx_BG025: + .global gGfx_BG025_GlobalStudiosFrontGate +gGfx_BG025_GlobalStudiosFrontGate: .incbin "graphics/striped_images/backgrounds/global_studios/front_gate.8bpp.striped" - .global gGfx_BG026 -gGfx_BG026: + .global gGfx_BG026_GlobalStudiosStudio1 +gGfx_BG026_GlobalStudiosStudio1: .incbin "graphics/striped_images/backgrounds/global_studios/studio_1.8bpp.striped" - .global gGfx_BG027 -gGfx_BG027: + .global gGfx_BG027_Gavel2 +gGfx_BG027_Gavel2: .incbin "graphics/striped_images/backgrounds/gavel/2.8bpp.striped" - .global gGfx_BG028 -gGfx_BG028: + .global gGfx_BG028_Gavel3 +gGfx_BG028_Gavel3: .incbin "graphics/striped_images/backgrounds/gavel/3.8bpp.striped" - .global gGfx_BG029 -gGfx_BG029: + .global gGfx_BG029_EvidenceFeyCoDiagramLight +gGfx_BG029_EvidenceFeyCoDiagramLight: .incbin "graphics/striped_images/backgrounds/evidence/fey_co_diagram_light.4bpp.striped" - .global gGfx_BG030 -gGfx_BG030: + .global gGfx_BG030_DetentionCenter +gGfx_BG030_DetentionCenter: .incbin "graphics/striped_images/backgrounds/detention_center.8bpp.striped" - .global gGfx_BG031 -gGfx_BG031: + .global gGfx_BG031_BlueCorpCeoOffice +gGfx_BG031_BlueCorpCeoOffice: .incbin "graphics/striped_images/backgrounds/bluecorp_ceo_office.8bpp.striped" - .global gGfx_BG032 -gGfx_BG032: + .global gGfx_BG032_GatewaterHotelRoom +gGfx_BG032_GatewaterHotelRoom: .incbin "graphics/striped_images/backgrounds/gatewater_hotelroom.8bpp.striped" - .global gGfx_BG033 -gGfx_BG033: + .global gGfx_BG033_Case1FrankHoldingThinker +gGfx_BG033_Case1FrankHoldingThinker: .incbin "graphics/striped_images/backgrounds/cutscenes/case1/frank_holding_thinker.8bpp.striped" - .global gGfx_BG034 -gGfx_BG034: + .global gGfx_BG034_Case1CindyDeadOnFloor +gGfx_BG034_Case1CindyDeadOnFloor: .incbin "graphics/striped_images/backgrounds/cutscenes/case1/cindy_dead_on_floor.8bpp.striped" - .global gGfx_BG035 -gGfx_BG035: + .global gGfx_BG035_Case1CindyAndFrank +gGfx_BG035_Case1CindyAndFrank: .incbin "graphics/striped_images/backgrounds/cutscenes/case1/cindy_and_frank.8bpp.striped" - .global gGfx_BG036 -gGfx_BG036: + .global gGfx_BG036_Case1FrankCloseup1 +gGfx_BG036_Case1FrankCloseup1: .incbin "graphics/striped_images/backgrounds/cutscenes/case1/frank_closeup_1.8bpp.striped" - .global gGfx_BG037 -gGfx_BG037: + .global gGfx_BG037_Case1FrankCloseup2 +gGfx_BG037_Case1FrankCloseup2: .incbin "graphics/striped_images/backgrounds/cutscenes/case1/frank_closeup_2.8bpp.striped" - .global gGfx_BG038 -gGfx_BG038: + .global gGfx_BG038_Case1FrankCloseup3 +gGfx_BG038_Case1FrankCloseup3: .incbin "graphics/striped_images/backgrounds/cutscenes/case1/frank_closeup_3.8bpp.striped" - .global gGfx_BG039 -gGfx_BG039: + .global gGfx_BG039_GrossbergLawOfficesPainting +gGfx_BG039_GrossbergLawOfficesPainting: .incbin "graphics/striped_images/backgrounds/grossberg_law_offices/grossberg_law_offices_painting.8bpp.striped" - .global gGfx_BG040 -gGfx_BG040: + .global gGfx_BG040_GrossbergLawOfficesNoPainting +gGfx_BG040_GrossbergLawOfficesNoPainting: .incbin "graphics/striped_images/backgrounds/grossberg_law_offices/grossberg_law_offices_no_painting.8bpp.striped" - .global gGfx_BG041 -gGfx_BG041: + .global gGfx_BG041_WitnessCindyFindingFrank +gGfx_BG041_WitnessCindyFindingFrank: .incbin "graphics/striped_images/backgrounds/witness_account/cindy_finding_frank.4bpp.striped" - .global gGfx_BG042 -gGfx_BG042: + .global gGfx_BG042_WitnessFrankWitnessingLarry +gGfx_BG042_WitnessFrankWitnessingLarry: .incbin "graphics/striped_images/backgrounds/witness_account/frank_witnessing_larry.4bpp.striped" - .global gGfx_BG043 -gGfx_BG043: + .global gGfx_BG043_WitnessFrankFindingCindy +gGfx_BG043_WitnessFrankFindingCindy: .incbin "graphics/striped_images/backgrounds/witness_account/frank_finding_cindy.4bpp.striped" - .global gGfx_BG044 -gGfx_BG044: + .global gGfx_BG044_GlobalStudiosStudio2 +gGfx_BG044_GlobalStudiosStudio2: .incbin "graphics/striped_images/backgrounds/global_studios/studio_2.8bpp.striped" - .global gGfx_BG045 -gGfx_BG045: + .global gGfx_BG045_EvidenceMayaPhoneCall1 +gGfx_BG045_EvidenceMayaPhoneCall1: .incbin "graphics/striped_images/backgrounds/evidence/maya_phone_call_page_1.4bpp.striped" - .global gGfx_BG046 -gGfx_BG046: + .global gGfx_BG046_EvidenceMayaPhoneCall2 +gGfx_BG046_EvidenceMayaPhoneCall2: .incbin "graphics/striped_images/backgrounds/evidence/maya_phone_call_page_2.4bpp.striped" - .global gGfx_BG047 -gGfx_BG047: + .global gGfx_BG047_Gavel1 +gGfx_BG047_Gavel1: .incbin "graphics/striped_images/backgrounds/gavel/1.8bpp.striped" - .global gGfx_BG048 -gGfx_BG048: + .global gGfx_BG048_EvidenceMayaPhoneCall3 +gGfx_BG048_EvidenceMayaPhoneCall3: .incbin "graphics/striped_images/backgrounds/evidence/maya_phone_call_page_3.4bpp.striped" - .global gGfx_BG049 -gGfx_BG049: + .global gGfx_BG049_WitnessJackAtGate +gGfx_BG049_WitnessJackAtGate: .incbin "graphics/striped_images/backgrounds/witness_account/jack_at_gate_photo.4bpp.striped" - .global gGfx_BG050 -gGfx_BG050: + .global gGfx_BG050_WitnessJackDeadAtStudio1 +gGfx_BG050_WitnessJackDeadAtStudio1: .incbin "graphics/striped_images/backgrounds/witness_account/jack_dead_at_studio_1.4bpp.striped" - .global gGfx_BG051 -gGfx_BG051: + .global gGfx_BG051_WitnessJackWearingSamuraiSuit +gGfx_BG051_WitnessJackWearingSamuraiSuit: .incbin "graphics/striped_images/backgrounds/witness_account/jack_wearing_samurai_suit.4bpp.striped" - .global gGfx_BG052 -gGfx_BG052: + .global gGfx_BG052_WitnessVasquezPushingJackAftermath +gGfx_BG052_WitnessVasquezPushingJackAftermath: .incbin "graphics/striped_images/backgrounds/witness_account/vasquez_pushing_jack_aftermath.4bpp.striped" - .global gGfx_BG053 -gGfx_BG053: + .global gGfx_BG053_WitnessStaffEatingLunch +gGfx_BG053_WitnessStaffEatingLunch: .incbin "graphics/striped_images/backgrounds/witness_account/staff_eating_lunch.4bpp.striped" - .global gGfx_BG054 -gGfx_BG054: + .global gGfx_BG054_WitnessStudio2JackAndVasquez +gGfx_BG054_WitnessStudio2JackAndVasquez: .incbin "graphics/striped_images/backgrounds/witness_account/studio_2_jack_and_vasquez.4bpp.striped" - .global gGfx_BG055 -gGfx_BG055: + .global gGfx_BG055_WitnessCodyWitnessingSamurai +gGfx_BG055_WitnessCodyWitnessingSamurai: .incbin "graphics/striped_images/backgrounds/witness_account/cody_witnessing_samurai.4bpp.striped" - .global gGfx_BG056 -gGfx_BG056: + .global gGfx_BG056_WitnessSamuraiAtStudio2 +gGfx_BG056_WitnessSamuraiAtStudio2: .incbin "graphics/striped_images/backgrounds/witness_account/samurai_at_studio_2_photo.4bpp.striped" - .global gGfx_BG057 -gGfx_BG057: + .global gGfx_BG057_Witness5YearOldPhoto +gGfx_BG057_Witness5YearOldPhoto: .incbin "graphics/striped_images/backgrounds/witness_account/5_year_old_photo.4bpp.striped" - .global gGfx_BG058 -gGfx_BG058: + .global gGfx_BG058_GlobalStudiosStudio2TrailerMafia +gGfx_BG058_GlobalStudiosStudio2TrailerMafia: .incbin "graphics/striped_images/backgrounds/global_studios/studio_2_trailer_mafia.8bpp.striped" - .global gGfx_BG059 -gGfx_BG059: + .global gGfx_BG059_Case3PinkPrincess +gGfx_BG059_Case3PinkPrincess: .incbin "graphics/striped_images/backgrounds/cutscenes/case3/pink_princess.8bpp.striped" - .global gGfx_BG060 -gGfx_BG060: + .global gGfx_BG060_GlobalStudiosMonkeyOnStudio2Path +gGfx_BG060_GlobalStudiosMonkeyOnStudio2Path: .incbin "graphics/striped_images/backgrounds/global_studios/monkey_on_studio_2_path.8bpp.striped" - .global gGfx_BG061 -gGfx_BG061: + .global gGfx_BG061_EvidenceGlobalStudiosDiagram +gGfx_BG061_EvidenceGlobalStudiosDiagram: .incbin "graphics/striped_images/backgrounds/evidence/global_studio_diagram.4bpp.striped" - .global gGfx_BG062 -gGfx_BG062: + .global gGfx_BG062_WitnessWillPowerInjury +gGfx_BG062_WitnessWillPowerInjury: .incbin "graphics/striped_images/backgrounds/witness_account/will_power_injury.4bpp.striped" - .global gGfx_BG063 -gGfx_BG063: + .global gGfx_BG063_Case3SteelSamurai +gGfx_BG063_Case3SteelSamurai: .incbin "graphics/striped_images/backgrounds/cutscenes/case3/steel_samurai.8bpp.striped" @ ; END BACKGROUNDS - .global gGfx_BG064 -gGfx_BG064: + .global gPal_BG064_BustupPhoenix +gPal_BG064_BustupPhoenix: .incbin "graphics/bustup_phoenix.gbapal" - .global gUnknown_08360854 -gUnknown_08360854: + .global gMap_BG064_BustupPhoenix +gMap_BG064_BustupPhoenix: .incbin "graphics/bustup_phoenix.bin" - .global gUnknown_08360D04 -gUnknown_08360D04: + .global gGfx_BG064_BustupPhoenix +gGfx_BG064_BustupPhoenix: .incbin "graphics/bustup_phoenix.4bpp" - .global gGfx_BG065 -gGfx_BG065: + .global gPal_BG065_BustupEdgeworth +gPal_BG065_BustupEdgeworth: .incbin "graphics/bustup_edgeworth.gbapal" - .global gUnknown_08362544 -gUnknown_08362544: + .global gMap_BG065_BustupEdgeworth +gMap_BG065_BustupEdgeworth: .incbin "graphics/bustup_edgeworth.bin" - .global gUnknown_083629F4 -gUnknown_083629F4: + .global gGfx_BG065_BustupEdgeworth +gGfx_BG065_BustupEdgeworth: .incbin "graphics/bustup_edgeworth.4bpp" @ ; BEGIN BACKGROUNDS - .global gGfx_BG066 -gGfx_BG066: + .global gGfx_BG066_Speedlines +gGfx_BG066_Speedlines: .incbin "graphics/striped_images/speedlines.4bpp.striped" - .global gGfx_BG067 -gGfx_BG067: + .global gGfx_BG067_CourtroomBackground +gGfx_BG067_CourtroomBackground: .incbin "graphics/striped_images/courtroom_background.4bpp.striped" - .global gGfx_BG068 -gGfx_BG068: + .global gGfx_BG068_CapcomScreen +gGfx_BG068_CapcomScreen: .incbin "graphics/striped_images/capcom_screen.4bpp.striped" @ ; this entry here spills over into an explicitly referenced one (the next), why though... -@ .global gGfx_BG069 +@ .global gGfx_BG069_SteelSamuraiNight @ ; it looks like this reference skips the "table" of this striped image and directly goes to the data? @ .global gUnknown_083698B8 - .global gGfx_BG069 -gGfx_BG069: + .global gGfx_BG069_SteelSamuraiNight +gGfx_BG069_SteelSamuraiNight: .incbin "graphics/striped_images/steel_samurai_night.4bpp.striped" - .global gGfx_BG070 -gGfx_BG070: + .global gGfx_BG070_GourdLakeEntrance +gGfx_BG070_GourdLakeEntrance: .incbin "graphics/striped_images/gourd_lake_entrance.8bpp.striped" - .global gGfx_BG071 -gGfx_BG071: + .global gGfx_BG071_GourdLakePark +gGfx_BG071_GourdLakePark: .incbin "graphics/striped_images/gourd_lake_park.8bpp.striped" - .global gGfx_BG072 -gGfx_BG072: + .global gGfx_BG072_GourdLakeParkNoBalloon +gGfx_BG072_GourdLakeParkNoBalloon: .incbin "graphics/striped_images/gourd_lake_park_no_balloon.8bpp.striped" - .global gGfx_BG073 -gGfx_BG073: + .global gGfx_BG073_GourdLakeBeach +gGfx_BG073_GourdLakeBeach: .incbin "graphics/striped_images/gourd_lake_beach.8bpp.striped" - .global gGfx_BG074 -gGfx_BG074: + .global gGfx_BG074_Case3IntroGrass +gGfx_BG074_Case3IntroGrass: .incbin "graphics/striped_images/case3_intro_grass.4bpp.striped" - .global gGfx_BG075 -gGfx_BG075: + .global gGfx_BG075_Case3IntroTrees +gGfx_BG075_Case3IntroTrees: .incbin "graphics/striped_images/case3_intro_trees.4bpp.striped" - .global gGfx_BG076 -gGfx_BG076: + .global gGfx_BG076_Case3IntroSteelSamuraiPosing +gGfx_BG076_Case3IntroSteelSamuraiPosing: .incbin "graphics/striped_images/case3_intro_steel_samurai_posing.4bpp.striped" - .global gGfx_BG077 -gGfx_BG077: + .global gGfx_BG077_GourdLakeBoatRental +gGfx_BG077_GourdLakeBoatRental: .incbin "graphics/striped_images/gourd_lake_boat_rental.8bpp.striped" - .global gGfx_BG078 -gGfx_BG078: + .global gGfx_BG078_GourdLakeBoatRentalHouse +gGfx_BG078_GourdLakeBoatRentalHouse: .incbin "graphics/striped_images/gourd_lake_boat_rental_house.8bpp.striped" - .global gGfx_BG079 -gGfx_BG079: + .global gGfx_BG079_PoliceStationLobby +gGfx_BG079_PoliceStationLobby: .incbin "graphics/striped_images/police_station_lobby.8bpp.striped" - .global gGfx_BG080 -gGfx_BG080: + .global gGfx_BG080_PoliceStationEvidenceStorage +gGfx_BG080_PoliceStationEvidenceStorage: .incbin "graphics/striped_images/police_station_evidence_storage.8bpp.striped" - .global gGfx_BG081 -gGfx_BG081: + .global gGfx_BG081_Case3IntroFaceoff +gGfx_BG081_Case3IntroFaceoff: .incbin "graphics/striped_images/case3_intro_faceoff.4bpp.striped" - .global gGfx_BG082 -gGfx_BG082: - .incbin "graphics/striped_images/3A6934.4bpp.striped" + .global gGfx_BG082_EvidenceDL6CaseFile1 +gGfx_BG082_EvidenceDL6CaseFile1: + .incbin "graphics/striped_images/backgrounds/evidence/dl6_case_file_page_1.4bpp.striped" - .global gGfx_BG083 -gGfx_BG083: - .incbin "graphics/striped_images/3A7790.4bpp.striped" + .global gGfx_BG083_EvidenceDL6CaseFile2 +gGfx_BG083_EvidenceDL6CaseFile2: + .incbin "graphics/striped_images/backgrounds/evidence/dl6_case_file_page_2.4bpp.striped" - .global gGfx_BG084 -gGfx_BG084: - .incbin "graphics/striped_images/3A8648.4bpp.striped" + .global gGfx_BG084_EvidenceDL6CaseFile3 +gGfx_BG084_EvidenceDL6CaseFile3: + .incbin "graphics/striped_images/backgrounds/evidence/dl6_case_file_page_3.4bpp.striped" - .global gGfx_BG085 -gGfx_BG085: + .global gGfx_BG085_Case4TrainStation +gGfx_BG085_Case4TrainStation: .incbin "graphics/striped_images/case4_train_station.8bpp.striped" - .global gGfx_BG086 -gGfx_BG086: + .global gGfx_BG086_Case4GourdLakeMap +gGfx_BG086_Case4GourdLakeMap: .incbin "graphics/striped_images/case4_gourd_lake_map.4bpp.striped" - .global gGfx_BG087 -gGfx_BG087: + .global gGfx_BG087_Case4LottasPhotoZoomed +gGfx_BG087_Case4LottasPhotoZoomed: .incbin "graphics/striped_images/case4_lottas_photo_zoomed.4bpp.striped" - .global gGfx_BG088 -gGfx_BG088: + .global gGfx_BG088_Case4ElevatorPhoto +gGfx_BG088_Case4ElevatorPhoto: .incbin "graphics/striped_images/case4_elevator_photo.4bpp.striped" - .global gGfx_BG089 -gGfx_BG089: + .global gGfx_BG089_Case4Newspaper +gGfx_BG089_Case4Newspaper: .incbin "graphics/striped_images/case4_newspaper.8bpp.striped" - .global gGfx_BG090 -gGfx_BG090: + .global gGfx_BG090_Case4BalloonLaunching +gGfx_BG090_Case4BalloonLaunching: .incbin "graphics/striped_images/case4_balloon_launching.4bpp.striped" - .global gGfx_BG091 -gGfx_BG091: + .global gGfx_BG091_Case4BalloonLandingInLake +gGfx_BG091_Case4BalloonLandingInLake: .incbin "graphics/striped_images/case4_balloon_landing_in_lake.4bpp.striped" - .global gGfx_BG092 -gGfx_BG092: + .global gGfx_BG092_Case4LarrySearchingLake +gGfx_BG092_Case4LarrySearchingLake: .incbin "graphics/striped_images/case4_larry_searching_lake.4bpp.striped" - .global gGfx_BG093 -gGfx_BG093: + .global gGfx_BG093_Case4ClassTrial +gGfx_BG093_Case4ClassTrial: .incbin "graphics/striped_images/case4_class_trial.8bpp.striped" - .global gGfx_BG094 -gGfx_BG094: + .global gGfx_BG094_Case4LottasPhotoFar +gGfx_BG094_Case4LottasPhotoFar: .incbin "graphics/striped_images/case4_lottas_photo_far.4bpp.striped" - .global gGfx_BG095 -gGfx_BG095: + .global gGfx_BG095_Case4ClassTrialPhoenix +gGfx_BG095_Case4ClassTrialPhoenix: .incbin "graphics/striped_images/case4_class_trial_phoenix.8bpp.striped" - .global gGfx_BG096 -gGfx_BG096: + .global gGfx_BG096_Case4ClassTrialEdgeworth +gGfx_BG096_Case4ClassTrialEdgeworth: .incbin "graphics/striped_images/case4_class_trial_edgeworth.8bpp.striped" - .global gGfx_BG097 -gGfx_BG097: + .global gGfx_BG097_Case4ClassTrialLarry +gGfx_BG097_Case4ClassTrialLarry: .incbin "graphics/striped_images/case4_class_trial_larry.8bpp.striped" - .global gGfx_BG098 -gGfx_BG098: + .global gGfx_BG098_Case4YanniThreatening +gGfx_BG098_Case4YanniThreatening: .incbin "graphics/striped_images/case4_yanni_threatening.4bpp.striped" - .global gGfx_BG099 -gGfx_BG099: + .global gGfx_BG099_Case4ShootWaterFromBoat +gGfx_BG099_Case4ShootWaterFromBoat: .incbin "graphics/striped_images/case4_shoot_water_from_boat.4bpp.striped" - .global gGfx_BG100 -gGfx_BG100: + .global gGfx_BG100_Case4ElevatorSuffocating +gGfx_BG100_Case4ElevatorSuffocating: .incbin "graphics/striped_images/case4_elevator_suffocating.4bpp.striped" - .global gGfx_BG101 -gGfx_BG101: + .global gGfx_BG101_Case4ElevatorEdgeworthThrow +gGfx_BG101_Case4ElevatorEdgeworthThrow: .incbin "graphics/striped_images/case4_elevator_edgeworth_throw.4bpp.striped" - .global gGfx_BG102 -gGfx_BG102: + .global gGfx_BG102_Case4ElevatorVonKarmaShot +gGfx_BG102_Case4ElevatorVonKarmaShot: .incbin "graphics/striped_images/case4_elevator_vonkarma_shot.4bpp.striped" - .global gGfx_BG103 -gGfx_BG103: + .global gGfx_BG103_Case4ElevatorVonKarmaInDoor +gGfx_BG103_Case4ElevatorVonKarmaInDoor: .incbin "graphics/striped_images/case4_elevator_vonkarma_in_door.4bpp.striped" - .global gGfx_BG104 -gGfx_BG104: + .global gGfx_BG104_Case4TrainStationMayaLeaving +gGfx_BG104_Case4TrainStationMayaLeaving: .incbin "graphics/striped_images/case4_train_station_maya_leaving.8bpp.striped" - .global gGfx_BG105 -gGfx_BG105: + .global gGfx_BG105_TrialWon +gGfx_BG105_TrialWon: .incbin "graphics/striped_images/trial_won.8bpp.striped" - .global gGfx_BG106 -gGfx_BG106: + .global gGfx_BG106_Case4IntroLakeOneInBoat +gGfx_BG106_Case4IntroLakeOneInBoat: .incbin "graphics/striped_images/case4_intro_lake_one_in_boat.4bpp.striped" - .global gGfx_BG107 -gGfx_BG107: + .global gGfx_BG107_Case4IntroThreatenedToShoot +gGfx_BG107_Case4IntroThreatenedToShoot: .incbin "graphics/striped_images/case4_intro_threatened_to_shoot.4bpp.striped" - .global gGfx_BG108 -gGfx_BG108: + .global gGfx_BG108_Case4IntroEdgeworthPicksUpGun +gGfx_BG108_Case4IntroEdgeworthPicksUpGun: .incbin "graphics/striped_images/case4_intro_edgeworth_picks_gun_up.8bpp.striped" - .global gGfx_BG109 -gGfx_BG109: + .global gGfx_BG109_CapcomScreenBW +gGfx_BG109_CapcomScreenBW: .incbin "graphics/striped_images/capcom_screen_bw.4bpp.striped" - .global gGfx_BG110 -gGfx_BG110: + .global gGfx_BG110_DemoTitleScreen +gGfx_BG110_DemoTitleScreen: .incbin "graphics/striped_images/title_screen_demo.8bpp.striped" - .global gGfx_BG111 -gGfx_BG111: + .global gGfx_BG111_DemoComingSoon +gGfx_BG111_DemoComingSoon: .incbin "graphics/striped_images/coming_soon_screen.8bpp.striped" @ ; END - .global gUnknown_08427608 -gUnknown_08427608: + .global gGfx_SpeedlinesFirstAndLastColumns +gGfx_SpeedlinesFirstAndLastColumns: .incbin "graphics/speedlines_first_and_last_columns.4bpp" @ BEGIN COURT SCROLLS diff --git a/graphics.mk b/graphics.mk index de89393..73a79bc 100644 --- a/graphics.mk +++ b/graphics.mk @@ -4,6 +4,18 @@ $(EVIDENCE_PROFILE_DESCRIPTIONS)/%.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS)/%.png $(EVIDENCE_PROFILE_DESCRIPTIONS)/%.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS)/%.4bpp $(GBAGFX) $< $@ -search 8 +EVIDENCE_PROFILE_DESCRIPTIONS_EVIDENCE := graphics/evidence_profile_descriptions/evidence +$(EVIDENCE_PROFILE_DESCRIPTIONS_EVIDENCE)/%.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS_EVIDENCE)/%.png + $(GBAGFX) $< $@ -mwidth 4 -mheight 4 +$(EVIDENCE_PROFILE_DESCRIPTIONS_EVIDENCE)/%.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS_EVIDENCE)/%.4bpp + $(GBAGFX) $< $@ -search 8 + +EVIDENCE_PROFILE_DESCRIPTIONS_PROFILES := graphics/evidence_profile_descriptions/profiles +$(EVIDENCE_PROFILE_DESCRIPTIONS_PROFILES)/%.4bpp: $(EVIDENCE_PROFILE_DESCRIPTIONS_PROFILES)/%.png + $(GBAGFX) $< $@ -mwidth 4 -mheight 4 +$(EVIDENCE_PROFILE_DESCRIPTIONS_PROFILES)/%.4bpp.lz: $(EVIDENCE_PROFILE_DESCRIPTIONS_PROFILES)/%.4bpp + $(GBAGFX) $< $@ -search 8 + LOCATION_CHOICES := graphics/location_choices TALK_CHOICES := graphics/talk_choices diff --git a/graphics/striped_images/3A6934.png b/graphics/striped_images/backgrounds/evidence/dl6_case_file_page_1.png similarity index 100% rename from graphics/striped_images/3A6934.png rename to graphics/striped_images/backgrounds/evidence/dl6_case_file_page_1.png diff --git a/graphics/striped_images/3A7790.png b/graphics/striped_images/backgrounds/evidence/dl6_case_file_page_2.png similarity index 100% rename from graphics/striped_images/3A7790.png rename to graphics/striped_images/backgrounds/evidence/dl6_case_file_page_2.png diff --git a/graphics/striped_images/3A8648.png b/graphics/striped_images/backgrounds/evidence/dl6_case_file_page_3.png similarity index 100% rename from graphics/striped_images/3A8648.png rename to graphics/striped_images/backgrounds/evidence/dl6_case_file_page_3.png diff --git a/include/constants/animations b/include/constants/animations deleted file mode 100644 index e69de29..0000000 diff --git a/include/graphics.h b/include/graphics.h index 1230d1d..927e11b 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -9,12 +9,12 @@ #define GFX_BASE_ADDR (ROM_START + 0x180000) -#define gGfxPalTitleScreen ((u8*)(ROM_START + 0x180000)) +#define gPalTitleScreen ((u8*)(ROM_START + 0x180000)) #define gGfx8lzTitleScreen ((u8*)(ROM_START + 0x180200)) -#define gGfxPalTitleScreenDemo ((u8*)(ROM_START + 0x182D08)) +#define gPalTitleScreenDemo ((u8*)(ROM_START + 0x182D08)) #define gGfx8lzTitleScreenDemo ((u8*)(ROM_START + 0x182F08)) #define gUnusedAsciiCharSet ((u8*)(ROM_START + 0x185D20)) -#define gGfxPalEvidenceProfileDesc ((u8*)(GFX_BASE_ADDR + 0x6520)) +#define gPalEvidenceProfileDesc ((u8*)(GFX_BASE_ADDR + 0x6520)) #define gUnknown_08186540 ((u8*)(ROM_START + 0x186540)) #define gGfx4bppNametags ((u8*)(ROM_START + 0x187540)) #define gGfx4bppTestimonyArrows ((u8*)(GFX_BASE_ADDR + 0xBD40)) @@ -23,36 +23,36 @@ #define gGfx4bppControllerButtons ((u8*)(GFX_BASE_ADDR + 0xF4C0)) #define gGfx4bppInvestigationScrollButton ((u8*)(ROM_START + 0x18F6C0)) #define gGfx4bppTestimonyTextTiles ((u8*)(ROM_START + 0x18F8C0)) -#define gUnknown_081900C0 ((u8*)(ROM_START + 0x1900C0)) -#define gUnknown_081904C0 ((u8*)(GFX_BASE_ADDR + 0x104C0)) -#define gUnknown_081906C0 ((u8*)(GFX_BASE_ADDR + 0x106C0)) -#define gUnknown_081908C0 ((u8*)(ROM_START + 0x1908C0)) -#define gUnknown_08190AC0 ((u8*)(ROM_START + 0x190AC0)) -#define gUnknown_08190FC0 ((u8*)(ROM_START + 0x190FC0)) -#define gUnknown_081911C0 ((u8*)(ROM_START + 0x1911C0)) -#define gUnknown_081914A0 ((u8*)(ROM_START + 0x1914A0)) -#define gUnknown_08191CA0 ((u8*)(ROM_START + 0x191CA0)) -#define gUnknown_081924A0 ((u8*)(ROM_START + 0x1924A0)) -#define gUnknown_08192CA0 ((u8*)(ROM_START + 0x192CA0)) -#define gUnknown_08193CA0 ((u8*)(ROM_START + 0x193CA0)) -#define gUnknown_081940A0 ((u8*)(ROM_START + 0x1940A0)) -#define gUnknown_081940E0 ((u8*)(GFX_BASE_ADDR + 0x140E0)) -#define gUnknown_08194200 ((u8*)(GFX_BASE_ADDR + 0x14200)) -#define gUnknown_08194240 ((u8*)(GFX_BASE_ADDR + 0x14240)) -#define gUnknown_08194260 ((u8*)(GFX_BASE_ADDR + 0x14260)) -#define gUnknown_08194280 ((u8*)(ROM_START + 0x194280)) -#define gUnknown_081942A0 ((u8*)(ROM_START + 0x1942A0)) -#define gUnknown_081942C0 ((u8*)(GFX_BASE_ADDR + 0x142C0)) -#define gUnknown_081944E0 ((u8*)(ROM_START + 0x1944E0)) -#define gUnknown_08194500 ((u8*)(ROM_START + 0x194500)) -#define gUnknown_08194520 ((u8*)(ROM_START + 0x194520)) -#define gUnknown_08194540 ((u8*)(ROM_START + 0x194540)) -#define gUnknown_08194560 ((u8*)(ROM_START + 0x194560)) -#define gUnknown_08194580 ((u8*)(ROM_START + 0x194580)) -#define gUnknown_08194640 ((u8*)(ROM_START + 0x194640)) -#define gUnknown_081946C0 ((u8*)(ROM_START + 0x1946C0)) -#define gUnknown_081954A8 ((u8*)(ROM_START + 0x1954A8)) -#define gUnknown_081964A8 ((u8*)(ROM_START + 0x1964A8)) +#define gGfxTrialPressPresentButtons ((u8*)(ROM_START + 0x1900C0)) +#define gGfxCourtRecordPresentBackText ((u8*)(GFX_BASE_ADDR + 0x104C0)) +#define gGfxCourtRecordProfilesText ((u8*)(GFX_BASE_ADDR + 0x106C0)) +#define gGfxCourtRecordEvidenceText ((u8*)(ROM_START + 0x1908C0)) +#define gGfxInvestigationExamineCursor ((u8*)(ROM_START + 0x190AC0)) +#define gGfxInvestigationCheckmark ((u8*)(ROM_START + 0x190FC0)) +#define gGfxTrialGameOverDoors ((u8*)(ROM_START + 0x1911C0)) +#define gGfxTrialNotGuilty1 ((u8*)(ROM_START + 0x1914A0)) +#define gGfxTrialGuilty1 ((u8*)(ROM_START + 0x191CA0)) +#define gGfxTrialGuiltyNotGuilty2 ((u8*)(ROM_START + 0x1924A0)) +#define gGfxTrialGameOverText ((u8*)(ROM_START + 0x192CA0)) +#define gGfxNewGameContinue ((u8*)(ROM_START + 0x193CA0)) +#define gGfxTrialConfetti ((u8*)(ROM_START + 0x1940A0)) +#define gPalCrossExaminationUI ((u8*)(GFX_BASE_ADDR + 0x140E0)) +#define gPalActionButtons ((u8*)(GFX_BASE_ADDR + 0x14200)) +#define gPalCourtRecordControlsBlurb ((u8*)(GFX_BASE_ADDR + 0x14240)) +#define gPalInvestigationScrollPrompt ((u8*)(GFX_BASE_ADDR + 0x14260)) +#define gPalTrialTestimonyTextTiles ((u8*)(ROM_START + 0x194280)) +#define gPalTrialPressPresentButtons ((u8*)(ROM_START + 0x1942A0)) +#define gPalInvestigationExamineCursors ((u8*)(GFX_BASE_ADDR + 0x142C0)) +#define gPalInvestigationCheckmark ((u8*)(ROM_START + 0x1944E0)) +#define gPalTrialGameOverDoors ((u8*)(ROM_START + 0x194500)) +#define gPalTrialGuilty ((u8*)(ROM_START + 0x194520)) +#define gPalTrialNotGuilty ((u8*)(ROM_START + 0x194540)) +#define gPalTrialGameOverText ((u8*)(ROM_START + 0x194560)) +#define gPalNewGameContinue ((u8*)(ROM_START + 0x194580)) +#define gPalConfetti ((u8*)(ROM_START + 0x194640)) +#define gGfx4lzEpisodeSelectOptions ((u8*)(ROM_START + 0x1946C0)) +#define gGfxFromSaveOrBeginning ((u8*)(ROM_START + 0x1954A8)) +#define gGfxSaveYesOrNo ((u8*)(ROM_START + 0x1964A8)) #define gUnknown_08196CA8 ((u8*)(ROM_START + 0x196CA8)) #define gUnknown_081970DC ((u8*)(ROM_START + 0x1970DC)) #define gUnknown_08197514 ((u8*)(ROM_START + 0x197514)) @@ -162,150 +162,150 @@ #define gUnknown_081B2150 ((u8*)(ROM_START + 0x1B2150)) #define gUnknown_081B25F0 ((u8*)(ROM_START + 0x1B25F0)) -#define gUnknown_081B290C ((u8*)(GFX_BASE_ADDR + 0x3290C)) +#define gGfxEvidenceProfilePictures ((u8*)(GFX_BASE_ADDR + 0x3290C)) //~ extern u8 gTextPal[0x20]; #define gTextPal ((u8*)(ROM_START + 0x1d310c)) #define gCharSet ((u8*)(GFX_BASE_ADDR + 0x5312C)) -#define gGfxPalChoiceSelected ((u8*)(ROM_START + 0x1FD92C)) -#define gGfxPalChoiceGreyedOut ((u8*)(ROM_START + 0x1FD94C)) +#define gPalChoiceSelected ((u8*)(ROM_START + 0x1FD92C)) +#define gPalChoiceGreyedOut ((u8*)(ROM_START + 0x1FD94C)) -#define gUnknown_081FD96C ((u8*)(ROM_START + 0x1FD96C)) -#define gUnknown_0820816C ((u8*)(ROM_START + 0x20816C)) -#define gUnknown_0824696C ((u8*)(ROM_START + 0x24696C)) -#define gUnknown_0824698C ((u8*)(ROM_START + 0x24698C)) -#define gUnknown_08246A0C ((u8*)(ROM_START + 0x246A0C)) -#define gUnknown_08246A8C ((u8*)(ROM_START + 0x246A8C)) -#define gUnknown_08246E8C ((u8*)(ROM_START + 0x246E8C)) -#define gUnknown_08246ECC ((u8*)(ROM_START + 0x246ECC)) -#define gUnknown_082476CC ((u8*)(ROM_START + 0x2476CC)) -#define gUnknown_08247ECC ((u8*)(ROM_START + 0x247ECC)) -#define gUnknown_082486CC ((u8*)(ROM_START + 0x2486CC)) -#define gUnknown_0824874C ((u8*)(ROM_START + 0x24874C)) -#define gUnknown_0824884C ((u8*)(ROM_START + 0x24884C)) -#define gUnknown_082488CC ((u8*)(ROM_START + 0x2488CC)) -#define gUnknown_0824890C ((u8*)(ROM_START + 0x24890C)) -#define gUnknown_08248B0C ((u8*)(ROM_START + 0x248B0C)) -#define gUnknown_08248C0C ((u8*)(ROM_START + 0x248C0C)) -#define gGfx_BG000 ((u8*)(ROM_START + 0x248C4C)) -#define gGfx_BG001 ((u8*)(ROM_START + 0x25280C)) -#define gGfx_BG002 ((u8*)(ROM_START + 0x257F28)) -#define gGfx_BG003 ((u8*)(ROM_START + 0x25CCCC)) -#define gGfx_BG004 ((u8*)(ROM_START + 0x25EF64)) -#define gGfx_BG005 ((u8*)(ROM_START + 0x2610F0)) -#define gGfx_BG006 ((u8*)(ROM_START + 0x263898)) -#define gGfx_BG007 ((u8*)(ROM_START + 0x26B6DC)) -#define gGfx_BG008 ((u8*)(ROM_START + 0x271DE8)) -#define gGfx_BG009 ((u8*)(ROM_START + 0x278824)) -#define gGfx_BG010 ((u8*)(ROM_START + 0x27CEEC)) -#define gGfx_BG011 ((u8*)(ROM_START + 0x282870)) -#define gGfx_BG012 ((u8*)(ROM_START + 0x288AE0)) -#define gGfx_BG013 ((u8*)(ROM_START + 0x291ADC)) -#define gGfx_BG014 ((u8*)(ROM_START + 0x293DC0)) -#define gGfx_BG015 ((u8*)(ROM_START + 0x296138)) -#define gGfx_BG016 ((u8*)(ROM_START + 0x296E28)) -#define gGfx_BG017 ((u8*)(ROM_START + 0x29A23C)) -#define gGfx_BG018 ((u8*)(ROM_START + 0x29E7A4)) -#define gGfx_BG019 ((u8*)(ROM_START + 0x2A3BA8)) -#define gGfx_BG020 ((u8*)(ROM_START + 0x2A8E3C)) -#define gGfx_BG021 ((u8*)(ROM_START + 0x2AE378)) -#define gGfx_BG022 ((u8*)(ROM_START + 0x2B6B78)) -#define gGfx_BG023 ((u8*)(ROM_START + 0x2BDC88)) -#define gGfx_BG024 ((u8*)(ROM_START + 0x2BFC24)) -#define gGfx_BG025 ((u8*)(ROM_START + 0x2C5020)) -#define gGfx_BG026 ((u8*)(ROM_START + 0x2C9600)) -#define gGfx_BG027 ((u8*)(ROM_START + 0x2CE308)) -#define gGfx_BG028 ((u8*)(ROM_START + 0x2D1A90)) -#define gGfx_BG029 ((u8*)(ROM_START + 0x2D79EC)) -#define gGfx_BG030 ((u8*)(ROM_START + 0x2D8974)) -#define gGfx_BG031 ((u8*)(ROM_START + 0x2DC188)) -#define gGfx_BG032 ((u8*)(ROM_START + 0x2E1FA4)) -#define gGfx_BG033 ((u8*)(ROM_START + 0x2E6BBC)) -#define gGfx_BG034 ((u8*)(ROM_START + 0x2EB2B8)) -#define gGfx_BG035 ((u8*)(ROM_START + 0x2EF904)) -#define gGfx_BG036 ((u8*)(ROM_START + 0x2F7D4C)) -#define gGfx_BG037 ((u8*)(ROM_START + 0x2FAF44)) -#define gGfx_BG038 ((u8*)(ROM_START + 0x2FE610)) -#define gGfx_BG039 ((u8*)(ROM_START + 0x3022F0)) -#define gGfx_BG040 ((u8*)(ROM_START + 0x3081E4)) -#define gGfx_BG041 ((u8*)(ROM_START + 0x30D2D8)) -#define gGfx_BG042 ((u8*)(ROM_START + 0x31002C)) -#define gGfx_BG043 ((u8*)(ROM_START + 0x312664)) -#define gGfx_BG044 ((u8*)(ROM_START + 0x314F8C)) -#define gGfx_BG045 ((u8*)(ROM_START + 0x31E8E0)) -#define gGfx_BG046 ((u8*)(ROM_START + 0x31F624)) -#define gGfx_BG047 ((u8*)(ROM_START + 0x320328)) -#define gGfx_BG048 ((u8*)(ROM_START + 0x3230C0)) -#define gGfx_BG049 ((u8*)(ROM_START + 0x323EDC)) -#define gGfx_BG050 ((u8*)(ROM_START + 0x327074)) -#define gGfx_BG051 ((u8*)(ROM_START + 0x32AFB8)) -#define gGfx_BG052 ((u8*)(ROM_START + 0x32E7B0)) -#define gGfx_BG053 ((u8*)(ROM_START + 0x331B38)) -#define gGfx_BG054 ((u8*)(ROM_START + 0x335A58)) -#define gGfx_BG055 ((u8*)(ROM_START + 0x339144)) -#define gGfx_BG056 ((u8*)(ROM_START + 0x33DC0C)) -#define gGfx_BG057 ((u8*)(ROM_START + 0x33F720)) -#define gGfx_BG058 ((u8*)(ROM_START + 0x342908)) -#define gGfx_BG059 ((u8*)(ROM_START + 0x34863C)) -#define gGfx_BG060 ((u8*)(ROM_START + 0x34F218)) -#define gGfx_BG061 ((u8*)(ROM_START + 0x35699C)) -#define gGfx_BG062 ((u8*)(ROM_START + 0x357870)) -#define gGfx_BG063 ((u8*)(ROM_START + 0x35ABD8)) +#define gGfxLocationChoices ((u8*)(ROM_START + 0x1FD96C)) +#define gGfxTalkChoices ((u8*)(ROM_START + 0x20816C)) +#define gPalMapMarkersPalette ((u8*)(ROM_START + 0x24696C)) +#define gGfxMapMarkersKiller ((u8*)(ROM_START + 0x24698C)) +#define gGfxMapMarkersVictim ((u8*)(ROM_START + 0x246A0C)) +#define gGfxMapMarkersCase2MiaBody ((u8*)(ROM_START + 0x246A8C)) +#define gGfxMapMarkersCase2Thinker ((u8*)(ROM_START + 0x246E8C)) +#define gGfxMapMarkersCase3Studio1 ((u8*)(ROM_START + 0x246ECC)) +#define gGfxMapMarkersCase3Studio2 ((u8*)(ROM_START + 0x2476CC)) +#define gGfxMapMarkersCase3EmployeeArea ((u8*)(ROM_START + 0x247ECC)) +#define gGfxMapMarkersCase3Gate ((u8*)(ROM_START + 0x2486CC)) +#define gGfxMapMarkersCase3MainGate ((u8*)(ROM_START + 0x24874C)) +#define gGfxMapMarkersGreen ((u8*)(ROM_START + 0x24884C)) +#define gGfxMapMarkersCase4BoatHorizontal ((u8*)(ROM_START + 0x2488CC)) +#define gGfxMapMarkersCase4BoatRentalShop ((u8*)(ROM_START + 0x24890C)) +#define gGfxMapMarkersCase4LottaSuv ((u8*)(ROM_START + 0x248B0C)) +#define gGfxMapMarkersCase4BoatVertical ((u8*)(ROM_START + 0x248C0C)) +#define gGfx_BG000_FeyCoMurderNight ((u8*)(ROM_START + 0x248C4C)) +#define gGfx_BG001_WrightCoOfficeDay ((u8*)(ROM_START + 0x25280C)) +#define gGfx_BG002_CourtDefendantLobby ((u8*)(ROM_START + 0x257F28)) +#define gGfx_BG003_CourtDefenseBench ((u8*)(ROM_START + 0x25CCCC)) +#define gGfx_BG004_CourtProsecutionBench ((u8*)(ROM_START + 0x25EF64)) +#define gGfx_BG005_CourtWitnessStand ((u8*)(ROM_START + 0x2610F0)) +#define gGfx_BG006_CourtRoom ((u8*)(ROM_START + 0x263898)) +#define gGfx_BG007_CourtCoCounsel ((u8*)(ROM_START + 0x26B6DC)) +#define gGfx_BG008_CourtJudgeSeat ((u8*)(ROM_START + 0x271DE8)) +#define gGfx_BG009_FeyCoEntranceNight ((u8*)(ROM_START + 0x278824)) +#define gGfx_BG010_Case2MayaSeeingDeadMia ((u8*)(ROM_START + 0x27CEEC)) +#define gGfx_BG011_GlobalStudiosStudioPath ((u8*)(ROM_START + 0x282870)) +#define gGfx_BG012_GlobalStudiosStaffArea ((u8*)(ROM_START + 0x288AE0)) +#define gGfx_BG013_WitnessMiaDodgingRight ((u8*)(ROM_START + 0x291ADC)) +#define gGfx_BG014_WitnessMiaDodgingLeft ((u8*)(ROM_START + 0x293DC0)) +#define gGfx_BG015_EvidenceFeyCoDiagram ((u8*)(ROM_START + 0x296138)) +#define gGfx_BG016_WitnessAprilGettingRoomService ((u8*)(ROM_START + 0x296E28)) +#define gGfx_BG017_Case2MiaDeadOnGround ((u8*)(ROM_START + 0x29A23C)) +#define gGfx_BG018_Case2PhoenixMayaMia ((u8*)(ROM_START + 0x29E7A4)) +#define gGfx_BG019_GlobalStudiosStudio2Trailer ((u8*)(ROM_START + 0x2A3BA8)) +#define gGfx_BG020_Case2AprilCallingPolice ((u8*)(ROM_START + 0x2A8E3C)) +#define gGfx_BG021_Case2ReddHittingMia ((u8*)(ROM_START + 0x2AE378)) +#define gGfx_BG022_Case2MiaBeingAttacked ((u8*)(ROM_START + 0x2B6B78)) +#define gGfx_BG023_Case2ReddHoldingThinker ((u8*)(ROM_START + 0x2BDC88)) +#define gGfx_BG024_GlobalStudiosDressingRoom ((u8*)(ROM_START + 0x2BFC24)) +#define gGfx_BG025_GlobalStudiosFrontGate ((u8*)(ROM_START + 0x2C5020)) +#define gGfx_BG026_GlobalStudiosStudio1 ((u8*)(ROM_START + 0x2C9600)) +#define gGfx_BG027_Gavel2 ((u8*)(ROM_START + 0x2CE308)) +#define gGfx_BG028_Gavel3 ((u8*)(ROM_START + 0x2D1A90)) +#define gGfx_BG029_EvidenceFeyCoDiagramLight ((u8*)(ROM_START + 0x2D79EC)) +#define gGfx_BG030_DetentionCenter ((u8*)(ROM_START + 0x2D8974)) +#define gGfx_BG031_BlueCorpCeoOffice ((u8*)(ROM_START + 0x2DC188)) +#define gGfx_BG032_GatewaterHotelRoom ((u8*)(ROM_START + 0x2E1FA4)) +#define gGfx_BG033_Case1FrankHoldingThinker ((u8*)(ROM_START + 0x2E6BBC)) +#define gGfx_BG034_Case1CindyDeadOnFloor ((u8*)(ROM_START + 0x2EB2B8)) +#define gGfx_BG035_Case1CindyAndFrank ((u8*)(ROM_START + 0x2EF904)) +#define gGfx_BG036_Case1FrankCloseup1 ((u8*)(ROM_START + 0x2F7D4C)) +#define gGfx_BG037_Case1FrankCloseup2 ((u8*)(ROM_START + 0x2FAF44)) +#define gGfx_BG038_Case1FrankCloseup3 ((u8*)(ROM_START + 0x2FE610)) +#define gGfx_BG039_GrossbergLawOfficesPainting ((u8*)(ROM_START + 0x3022F0)) +#define gGfx_BG040_GrossbergLawOfficesNoPainting ((u8*)(ROM_START + 0x3081E4)) +#define gGfx_BG041_WitnessCindyFindingFrank ((u8*)(ROM_START + 0x30D2D8)) +#define gGfx_BG042_WitnessFrankWitnessingLarry ((u8*)(ROM_START + 0x31002C)) +#define gGfx_BG043_WitnessFrankFindingCindy ((u8*)(ROM_START + 0x312664)) +#define gGfx_BG044_GlobalStudiosStudio2 ((u8*)(ROM_START + 0x314F8C)) +#define gGfx_BG045_EvidenceMayaPhoneCall1 ((u8*)(ROM_START + 0x31E8E0)) +#define gGfx_BG046_EvidenceMayaPhoneCall2 ((u8*)(ROM_START + 0x31F624)) +#define gGfx_BG047_Gavel1 ((u8*)(ROM_START + 0x320328)) +#define gGfx_BG048_EvidenceMayaPhoneCall3 ((u8*)(ROM_START + 0x3230C0)) +#define gGfx_BG049_WitnessJackAtGate ((u8*)(ROM_START + 0x323EDC)) +#define gGfx_BG050_WitnessJackDeadAtStudio1 ((u8*)(ROM_START + 0x327074)) +#define gGfx_BG051_WitnessJackWearingSamuraiSuit ((u8*)(ROM_START + 0x32AFB8)) +#define gGfx_BG052_WitnessVasquezPushingJackAftermath ((u8*)(ROM_START + 0x32E7B0)) +#define gGfx_BG053_WitnessStaffEatingLunch ((u8*)(ROM_START + 0x331B38)) +#define gGfx_BG054_WitnessStudio2JackAndVasquez ((u8*)(ROM_START + 0x335A58)) +#define gGfx_BG055_WitnessCodyWitnessingSamurai ((u8*)(ROM_START + 0x339144)) +#define gGfx_BG056_WitnessSamuraiAtStudio2 ((u8*)(ROM_START + 0x33DC0C)) +#define gGfx_BG057_Witness5YearOldPhoto ((u8*)(ROM_START + 0x33F720)) +#define gGfx_BG058_GlobalStudiosStudio2TrailerMafia ((u8*)(ROM_START + 0x342908)) +#define gGfx_BG059_Case3PinkPrincess ((u8*)(ROM_START + 0x34863C)) +#define gGfx_BG060_GlobalStudiosMonkeyOnStudio2Path ((u8*)(ROM_START + 0x34F218)) +#define gGfx_BG061_EvidenceGlobalStudiosDiagram ((u8*)(ROM_START + 0x35699C)) +#define gGfx_BG062_WitnessWillPowerInjury ((u8*)(ROM_START + 0x357870)) +#define gGfx_BG063_Case3SteelSamurai ((u8*)(ROM_START + 0x35ABD8)) -#define gGfx_BG064 ((u8*)(ROM_START + 0x360834)) -#define gUnknown_08360854 ((u16*)(ROM_START + 0x360854)) -#define gUnknown_08360D04 ((u8*)(ROM_START + 0x360D04)) -#define gGfx_BG065 ((u8*)(ROM_START + 0x362524)) -#define gUnknown_08362544 ((u16*)(ROM_START + 0x362544)) -#define gUnknown_083629F4 ((u8*)(ROM_START + 0x3629F4)) -#define gGfx_BG066 ((u8*)(ROM_START + 0x364794)) -#define gGfx_BG067 ((u8*)(ROM_START + 0x365640)) -#define gGfx_BG068 ((u8*)(ROM_START + 0x368BC4)) -#define gGfx_BG069 ((u8*)(GFX_BASE_ADDR + 0x1E9890)) -#define gGfx_BG070 ((u8*)(ROM_START + 0x36B924)) -#define gGfx_BG071 ((u8*)(ROM_START + 0x372D2C)) -#define gGfx_BG072 ((u8*)(ROM_START + 0x37920C)) -#define gGfx_BG073 ((u8*)(ROM_START + 0x37E52C)) -#define gGfx_BG074 ((u8*)(GFX_BASE_ADDR + 0x2099C4)) -#define gGfx_BG075 ((u8*)(ROM_START + 0x38A6F4)) -#define gGfx_BG076 ((u8*)(ROM_START + 0x38B364)) -#define gGfx_BG077 ((u8*)(ROM_START + 0x38D370)) -#define gGfx_BG078 ((u8*)(ROM_START + 0x392118)) -#define gGfx_BG079 ((u8*)(ROM_START + 0x396EB0)) -#define gGfx_BG080 ((u8*)(ROM_START + 0x39CD04)) -#define gGfx_BG081 ((u8*)(ROM_START + 0x3A3504)) -#define gGfx_BG082 ((u8*)(ROM_START + 0x3A6934)) -#define gGfx_BG083 ((u8*)(ROM_START + 0x3A7790)) -#define gGfx_BG084 ((u8*)(ROM_START + 0x3A8648)) -#define gGfx_BG085 ((u8*)(ROM_START + 0x3A9514)) -#define gGfx_BG086 ((u8*)(ROM_START + 0x3AFCC8)) -#define gGfx_BG087 ((u8*)(ROM_START + 0x3B0A94)) -#define gGfx_BG088 ((u8*)(ROM_START + 0x3B3724)) -#define gGfx_BG089 ((u8*)(ROM_START + 0x3B6C8C)) -#define gGfx_BG090 ((u8*)(ROM_START + 0x3BF1BC)) -#define gGfx_BG091 ((u8*)(ROM_START + 0x3C3724)) -#define gGfx_BG092 ((u8*)(ROM_START + 0x3C7654)) -#define gGfx_BG093 ((u8*)(ROM_START + 0x3CB0BC)) -#define gGfx_BG094 ((u8*)(ROM_START + 0x3D27A8)) -#define gGfx_BG095 ((u8*)(ROM_START + 0x3D5E64)) -#define gGfx_BG096 ((u8*)(ROM_START + 0x3DAAC0)) -#define gGfx_BG097 ((u8*)(ROM_START + 0x3E1514)) -#define gGfx_BG098 ((u8*)(ROM_START + 0x3E74E8)) -#define gGfx_BG099 ((u8*)(ROM_START + 0x3EAB84)) -#define gGfx_BG100 ((u8*)(ROM_START + 0x3EEAC0)) -#define gGfx_BG101 ((u8*)(ROM_START + 0x3F2BA4)) -#define gGfx_BG102 ((u8*)(ROM_START + 0x3F6C48)) -#define gGfx_BG103 ((u8*)(ROM_START + 0x3FB1D4)) -#define gGfx_BG104 ((u8*)(ROM_START + 0x3FD8D4)) -#define gGfx_BG105 ((u8*)(ROM_START + 0x4037F8)) -#define gGfx_BG106 ((u8*)(ROM_START + 0x40AC3C)) -#define gGfx_BG107 ((u8*)(ROM_START + 0x40D3C8)) -#define gGfx_BG108 ((u8*)(ROM_START + 0x40F8C0)) -#define gGfx_BG109 ((u8*)(ROM_START + 0x41B0F4)) -#define gGfx_BG110 ((u8*)(ROM_START + 0x41BD7C)) -#define gGfx_BG111 ((u8*)(ROM_START + 0x41EFC4)) -#define gUnknown_08427608 ((u8*)(ROM_START + 0x427608)) +#define gPal_BG064_BustupPhoenix ((u8*)(ROM_START + 0x360834)) +#define gMap_BG064_BustupPhoenix ((u16*)(ROM_START + 0x360854)) +#define gGfx_BG064_BustupPhoenix ((u8*)(ROM_START + 0x360D04)) +#define gPal_BG065_BustupEdgeworth ((u8*)(ROM_START + 0x362524)) +#define gMap_BG065_BustupEdgeworth ((u16*)(ROM_START + 0x362544)) +#define gGfx_BG065_BustupEdgeworth ((u8*)(ROM_START + 0x3629F4)) +#define gGfx_BG066_Speedlines ((u8*)(ROM_START + 0x364794)) +#define gGfx_BG067_CourtroomBackground ((u8*)(ROM_START + 0x365640)) +#define gGfx_BG068_CapcomScreen ((u8*)(ROM_START + 0x368BC4)) +#define gGfx_BG069_SteelSamuraiNight ((u8*)(GFX_BASE_ADDR + 0x1E9890)) +#define gGfx_BG070_GourdLakeEntrance ((u8*)(ROM_START + 0x36B924)) +#define gGfx_BG071_GourdLakePark ((u8*)(ROM_START + 0x372D2C)) +#define gGfx_BG072_GourdLakeParkNoBalloon ((u8*)(ROM_START + 0x37920C)) +#define gGfx_BG073_GourdLakeBeach ((u8*)(ROM_START + 0x37E52C)) +#define gGfx_BG074_Case3IntroGrass ((u8*)(GFX_BASE_ADDR + 0x2099C4)) +#define gGfx_BG075_Case3IntroTrees ((u8*)(ROM_START + 0x38A6F4)) +#define gGfx_BG076_Case3IntroSteelSamuraiPosing ((u8*)(ROM_START + 0x38B364)) +#define gGfx_BG077_GourdLakeBoatRental ((u8*)(ROM_START + 0x38D370)) +#define gGfx_BG078_GourdLakeBoatRentalHouse ((u8*)(ROM_START + 0x392118)) +#define gGfx_BG079_PoliceStationLobby ((u8*)(ROM_START + 0x396EB0)) +#define gGfx_BG080_PoliceStationEvidenceStorage ((u8*)(ROM_START + 0x39CD04)) +#define gGfx_BG081_Case3IntroFaceoff ((u8*)(ROM_START + 0x3A3504)) +#define gGfx_BG082_EvidenceDL6CaseFile1 ((u8*)(ROM_START + 0x3A6934)) +#define gGfx_BG083_EvidenceDL6CaseFile2 ((u8*)(ROM_START + 0x3A7790)) +#define gGfx_BG084_EvidenceDL6CaseFile3 ((u8*)(ROM_START + 0x3A8648)) +#define gGfx_BG085_Case4TrainStation ((u8*)(ROM_START + 0x3A9514)) +#define gGfx_BG086_Case4GourdLakeMap ((u8*)(ROM_START + 0x3AFCC8)) +#define gGfx_BG087_Case4LottasPhotoZoomed ((u8*)(ROM_START + 0x3B0A94)) +#define gGfx_BG088_Case4ElevatorPhoto ((u8*)(ROM_START + 0x3B3724)) +#define gGfx_BG089_Case4Newspaper ((u8*)(ROM_START + 0x3B6C8C)) +#define gGfx_BG090_Case4BalloonLaunching ((u8*)(ROM_START + 0x3BF1BC)) +#define gGfx_BG091_Case4BalloonLandingInLake ((u8*)(ROM_START + 0x3C3724)) +#define gGfx_BG092_Case4LarrySearchingLake ((u8*)(ROM_START + 0x3C7654)) +#define gGfx_BG093_Case4ClassTrial ((u8*)(ROM_START + 0x3CB0BC)) +#define gGfx_BG094_Case4LottasPhotoFar ((u8*)(ROM_START + 0x3D27A8)) +#define gGfx_BG095_Case4ClassTrialPhoenix ((u8*)(ROM_START + 0x3D5E64)) +#define gGfx_BG096_Case4ClassTrialEdgeworth ((u8*)(ROM_START + 0x3DAAC0)) +#define gGfx_BG097_Case4ClassTrialLarry ((u8*)(ROM_START + 0x3E1514)) +#define gGfx_BG098_Case4YanniThreatening ((u8*)(ROM_START + 0x3E74E8)) +#define gGfx_BG099_Case4ShootWaterFromBoat ((u8*)(ROM_START + 0x3EAB84)) +#define gGfx_BG100_Case4ElevatorSuffocating ((u8*)(ROM_START + 0x3EEAC0)) +#define gGfx_BG101_Case4ElevatorEdgeworthThrow ((u8*)(ROM_START + 0x3F2BA4)) +#define gGfx_BG102_Case4ElevatorVonKarmaShot ((u8*)(ROM_START + 0x3F6C48)) +#define gGfx_BG103_Case4ElevatorVonKarmaInDoor ((u8*)(ROM_START + 0x3FB1D4)) +#define gGfx_BG104_Case4TrainStationMayaLeaving ((u8*)(ROM_START + 0x3FD8D4)) +#define gGfx_BG105_TrialWon ((u8*)(ROM_START + 0x4037F8)) +#define gGfx_BG106_Case4IntroLakeOneInBoat ((u8*)(ROM_START + 0x40AC3C)) +#define gGfx_BG107_Case4IntroThreatenedToShoot ((u8*)(ROM_START + 0x40D3C8)) +#define gGfx_BG108_Case4IntroEdgeworthPicksUpGun ((u8*)(ROM_START + 0x40F8C0)) +#define gGfx_BG109_CapcomScreenBW ((u8*)(ROM_START + 0x41B0F4)) +#define gGfx_BG110_DemoTitleScreen ((u8*)(ROM_START + 0x41BD7C)) +#define gGfx_BG111_DemoComingSoon ((u8*)(ROM_START + 0x41EFC4)) +#define gGfx_SpeedlinesFirstAndLastColumns ((u8*)(ROM_START + 0x427608)) #define gGfxCourtscroll01 ((u8*)(ROM_START + 0x427D88)) #define gGfxCourtscroll02 ((u8*)(ROM_START + 0x472F88)) @@ -425,12 +425,12 @@ #define gGfxSeqAnimation54 ((u8*)(ROM_START + 0x749404)) #else -extern u8 gGfxPalTitleScreen[]; +extern u8 gPalTitleScreen[]; extern u8 gGfx8lzTitleScreen[]; -extern u8 gGfxPalTitleScreenDemo[]; +extern u8 gPalTitleScreenDemo[]; extern u8 gGfx8lzTitleScreenDemo[]; extern u8 gUnusedAsciiCharSet[]; -extern u8 gGfxPalEvidenceProfileDesc[]; +extern u8 gPalEvidenceProfileDesc[]; extern u8 gUnknown_08186540[]; extern u8 gGfx4bppNametags[]; extern u8 gGfx4bppTestimonyArrows[]; @@ -439,36 +439,36 @@ extern u8 gGfx4bppInvestigationActions[]; extern u8 gGfx4bppControllerButtons[]; extern u8 gGfx4bppInvestigationScrollButton[]; extern u8 gGfx4bppTestimonyTextTiles[]; -extern u8 gUnknown_081900C0[]; -extern u8 gUnknown_081904C0[]; -extern u8 gUnknown_081906C0[]; -extern u8 gUnknown_081908C0[]; -extern u8 gUnknown_08190AC0[]; -extern u8 gUnknown_08190FC0[]; -extern u8 gUnknown_081911C0[]; -extern u8 gUnknown_081914A0[]; -extern u8 gUnknown_08191CA0[]; -extern u8 gUnknown_081924A0[]; -extern u8 gUnknown_08192CA0[]; -extern u8 gUnknown_08193CA0[]; -extern u8 gUnknown_081940A0[]; -extern u8 gUnknown_081940E0[]; -extern u8 gUnknown_08194200[]; -extern u8 gUnknown_08194240[]; -extern u8 gUnknown_08194260[]; -extern u8 gUnknown_08194280[]; -extern u8 gUnknown_081942A0[]; -extern u8 gUnknown_081942C0[]; -extern u8 gUnknown_081944E0[]; -extern u8 gUnknown_08194500[]; -extern u8 gUnknown_08194520[]; -extern u8 gUnknown_08194540[]; -extern u8 gUnknown_08194560[]; -extern u8 gUnknown_08194580[]; -extern u8 gUnknown_08194640[]; -extern u8 gUnknown_081946C0[]; -extern u8 gUnknown_081954A8[]; -extern u8 gUnknown_081964A8[]; +extern u8 gGfxTrialPressPresentButtons[]; +extern u8 gGfxCourtRecordPresentBackText[]; +extern u8 gGfxCourtRecordProfilesText[]; +extern u8 gGfxCourtRecordEvidenceText[]; +extern u8 gGfxInvestigationExamineCursor[]; +extern u8 gGfxInvestigationCheckmark[]; +extern u8 gGfxTrialGameOverDoors[]; +extern u8 gGfxTrialNotGuilty1[]; +extern u8 gGfxTrialGuilty1[]; +extern u8 gGfxTrialGuiltyNotGuilty2[]; +extern u8 gGfxTrialGameOverText[]; +extern u8 gGfxNewGameContinue[]; +extern u8 gGfxTrialConfetti[]; +extern u8 gPalCrossExaminationUI[]; +extern u8 gPalActionButtons[]; +extern u8 gPalCourtRecordControlsBlurb[]; +extern u8 gPalInvestigationScrollPrompt[]; +extern u8 gPalTrialTestimonyTextTiles[]; +extern u8 gPalTrialPressPresentButtons[]; +extern u8 gPalInvestigationExamineCursors[]; +extern u8 gPalInvestigationCheckmark[]; +extern u8 gPalTrialGameOverDoors[]; +extern u8 gPalTrialGuilty[]; +extern u8 gPalTrialNotGuilty[]; +extern u8 gPalTrialGameOverText[]; +extern u8 gPalNewGameContinue[]; +extern u8 gPalConfetti[]; +extern u8 gGfx4lzEpisodeSelectOptions[]; +extern u8 gGfxFromSaveOrBeginning[]; +extern u8 gGfxSaveYesOrNo[]; extern u8 gUnknown_08196CA8[]; extern u8 gUnknown_081970DC[]; extern u8 gUnknown_08197514[]; @@ -577,19 +577,19 @@ extern u8 gUnknown_081B18C0[]; extern u8 gUnknown_081B1CBC[]; extern u8 gUnknown_081B2150[]; extern u8 gUnknown_081B25F0[]; -extern u8 gUnknown_081B290C[]; -extern u8 gUnknown_081B290C_pal[]; -extern u8 gUnknown_081B290C_gfx[]; -extern u8 gUnknown_081B312C_pal[]; -extern u8 gUnknown_081B312C_gfx[]; -extern u8 gUnknown_081B394C_pal[]; -extern u8 gUnknown_081B394C_gfx[]; -extern u8 gUnknown_081B416C_pal[]; -extern u8 gUnknown_081B416C_gfx[]; -extern u8 gUnknown_081B498C_pal[]; -extern u8 gUnknown_081B498C_gfx[]; -extern u8 gUnknown_081B51AC_pal[]; -extern u8 gUnknown_081B51AC_gfx[]; +extern u8 gGfxEvidenceProfilePictures[]; +extern u8 gPalEvidenceEmptyPlate[]; +extern u8 gGfxEvidenceEmptyPlate[]; +extern u8 gPalEvidenceLottasCamera[]; +extern u8 gGfxEvidenceLottasCamera[]; +extern u8 gPalEvidenceWiretap[]; +extern u8 gGfxEvidenceWiretap[]; +extern u8 gPalEvidenceMayasCellphone[]; +extern u8 gGfxEvidenceMayasCellphone[]; +extern u8 gPalEvidenceArticleGourdy[]; +extern u8 gGfxEvidenceArticleGourdy[]; +extern u8 gPalEvidenceBullet[]; +extern u8 gGfxEvidenceBullet[]; extern u8 gUnknown_081B59CC_pal[]; extern u8 gUnknown_081B59CC_gfx[]; extern u8 gUnknown_081B61EC_pal[]; @@ -708,144 +708,144 @@ extern u8 gUnknown_081D28EC_pal[]; extern u8 gUnknown_081D28EC_gfx[]; extern u8 gTextPal[]; extern u8 gCharSet[]; -extern u8 gGfxPalChoiceSelected[]; -extern u8 gGfxPalChoiceGreyedOut[]; +extern u8 gPalChoiceSelected[]; +extern u8 gPalChoiceGreyedOut[]; -extern u8 gUnknown_081FD96C[]; -extern u8 gUnknown_0820816C[]; -extern u8 gUnknown_0824696C[]; -extern u8 gUnknown_0824698C[]; -extern u8 gUnknown_08246A0C[]; -extern u8 gUnknown_08246A8C[]; -extern u8 gUnknown_08246E8C[]; -extern u8 gUnknown_08246ECC[]; -extern u8 gUnknown_082476CC[]; -extern u8 gUnknown_08247ECC[]; -extern u8 gUnknown_082486CC[]; -extern u8 gUnknown_0824874C[]; -extern u8 gUnknown_0824884C[]; -extern u8 gUnknown_082488CC[]; -extern u8 gUnknown_0824890C[]; -extern u8 gUnknown_08248B0C[]; -extern u8 gUnknown_08248C0C[]; -extern u8 gGfx_BG000[]; -extern u8 gGfx_BG001[]; -extern u8 gGfx_BG002[]; -extern u8 gGfx_BG003[]; -extern u8 gGfx_BG004[]; -extern u8 gGfx_BG005[]; -extern u8 gGfx_BG006[]; -extern u8 gGfx_BG007[]; -extern u8 gGfx_BG008[]; -extern u8 gGfx_BG009[]; -extern u8 gGfx_BG010[]; -extern u8 gGfx_BG011[]; -extern u8 gGfx_BG012[]; -extern u8 gGfx_BG013[]; -extern u8 gGfx_BG014[]; -extern u8 gGfx_BG015[]; -extern u8 gGfx_BG016[]; -extern u8 gGfx_BG017[]; -extern u8 gGfx_BG018[]; -extern u8 gGfx_BG019[]; -extern u8 gGfx_BG020[]; -extern u8 gGfx_BG021[]; -extern u8 gGfx_BG022[]; -extern u8 gGfx_BG023[]; -extern u8 gGfx_BG024[]; -extern u8 gGfx_BG025[]; -extern u8 gGfx_BG026[]; -extern u8 gGfx_BG027[]; -extern u8 gGfx_BG028[]; -extern u8 gGfx_BG029[]; -extern u8 gGfx_BG030[]; -extern u8 gGfx_BG031[]; -extern u8 gGfx_BG032[]; -extern u8 gGfx_BG033[]; -extern u8 gGfx_BG034[]; -extern u8 gGfx_BG035[]; -extern u8 gGfx_BG036[]; -extern u8 gGfx_BG037[]; -extern u8 gGfx_BG038[]; -extern u8 gGfx_BG039[]; -extern u8 gGfx_BG040[]; -extern u8 gGfx_BG041[]; -extern u8 gGfx_BG042[]; -extern u8 gGfx_BG043[]; -extern u8 gGfx_BG044[]; -extern u8 gGfx_BG045[]; -extern u8 gGfx_BG046[]; -extern u8 gGfx_BG047[]; -extern u8 gGfx_BG048[]; -extern u8 gGfx_BG049[]; -extern u8 gGfx_BG050[]; -extern u8 gGfx_BG051[]; -extern u8 gGfx_BG052[]; -extern u8 gGfx_BG053[]; -extern u8 gGfx_BG054[]; -extern u8 gGfx_BG055[]; -extern u8 gGfx_BG056[]; -extern u8 gGfx_BG057[]; -extern u8 gGfx_BG058[]; -extern u8 gGfx_BG059[]; -extern u8 gGfx_BG060[]; -extern u8 gGfx_BG061[]; -extern u8 gGfx_BG062[]; -extern u8 gGfx_BG063[]; +extern u8 gGfxLocationChoices[]; +extern u8 gGfxTalkChoices[]; +extern u8 gPalMapMarkersPalette[]; +extern u8 gGfxMapMarkersKiller[]; +extern u8 gGfxMapMarkersVictim[]; +extern u8 gGfxMapMarkersCase2MiaBody[]; +extern u8 gGfxMapMarkersCase2Thinker[]; +extern u8 gGfxMapMarkersCase3Studio1[]; +extern u8 gGfxMapMarkersCase3Studio2[]; +extern u8 gGfxMapMarkersCase3EmployeeArea[]; +extern u8 gGfxMapMarkersCase3Gate[]; +extern u8 gGfxMapMarkersCase3MainGate[]; +extern u8 gGfxMapMarkersGreen[]; +extern u8 gGfxMapMarkersCase4BoatHorizontal[]; +extern u8 gGfxMapMarkersCase4BoatRentalShop[]; +extern u8 gGfxMapMarkersCase4LottaSuv[]; +extern u8 gGfxMapMarkersCase4BoatVertical[]; +extern u8 gGfx_BG000_FeyCoMurderNight[]; +extern u8 gGfx_BG001_WrightCoOfficeDay[]; +extern u8 gGfx_BG002_CourtDefendantLobby[]; +extern u8 gGfx_BG003_CourtDefenseBench[]; +extern u8 gGfx_BG004_CourtProsecutionBench[]; +extern u8 gGfx_BG005_CourtWitnessStand[]; +extern u8 gGfx_BG006_CourtRoom[]; +extern u8 gGfx_BG007_CourtCoCounsel[]; +extern u8 gGfx_BG008_CourtJudgeSeat[]; +extern u8 gGfx_BG009_FeyCoEntranceNight[]; +extern u8 gGfx_BG010_Case2MayaSeeingDeadMia[]; +extern u8 gGfx_BG011_GlobalStudiosStudioPath[]; +extern u8 gGfx_BG012_GlobalStudiosStaffArea[]; +extern u8 gGfx_BG013_WitnessMiaDodgingRight[]; +extern u8 gGfx_BG014_WitnessMiaDodgingLeft[]; +extern u8 gGfx_BG015_EvidenceFeyCoDiagram[]; +extern u8 gGfx_BG016_WitnessAprilGettingRoomService[]; +extern u8 gGfx_BG017_Case2MiaDeadOnGround[]; +extern u8 gGfx_BG018_Case2PhoenixMayaMia[]; +extern u8 gGfx_BG019_GlobalStudiosStudio2Trailer[]; +extern u8 gGfx_BG020_Case2AprilCallingPolice[]; +extern u8 gGfx_BG021_Case2ReddHittingMia[]; +extern u8 gGfx_BG022_Case2MiaBeingAttacked[]; +extern u8 gGfx_BG023_Case2ReddHoldingThinker[]; +extern u8 gGfx_BG024_GlobalStudiosDressingRoom[]; +extern u8 gGfx_BG025_GlobalStudiosFrontGate[]; +extern u8 gGfx_BG026_GlobalStudiosStudio1[]; +extern u8 gGfx_BG027_Gavel2[]; +extern u8 gGfx_BG028_Gavel3[]; +extern u8 gGfx_BG029_EvidenceFeyCoDiagramLight[]; +extern u8 gGfx_BG030_DetentionCenter[]; +extern u8 gGfx_BG031_BlueCorpCeoOffice[]; +extern u8 gGfx_BG032_GatewaterHotelRoom[]; +extern u8 gGfx_BG033_Case1FrankHoldingThinker[]; +extern u8 gGfx_BG034_Case1CindyDeadOnFloor[]; +extern u8 gGfx_BG035_Case1CindyAndFrank[]; +extern u8 gGfx_BG036_Case1FrankCloseup1[]; +extern u8 gGfx_BG037_Case1FrankCloseup2[]; +extern u8 gGfx_BG038_Case1FrankCloseup3[]; +extern u8 gGfx_BG039_GrossbergLawOfficesPainting[]; +extern u8 gGfx_BG040_GrossbergLawOfficesNoPainting[]; +extern u8 gGfx_BG041_WitnessCindyFindingFrank[]; +extern u8 gGfx_BG042_WitnessFrankWitnessingLarry[]; +extern u8 gGfx_BG043_WitnessFrankFindingCindy[]; +extern u8 gGfx_BG044_GlobalStudiosStudio2[]; +extern u8 gGfx_BG045_EvidenceMayaPhoneCall1[]; +extern u8 gGfx_BG046_EvidenceMayaPhoneCall2[]; +extern u8 gGfx_BG047_Gavel1[]; +extern u8 gGfx_BG048_EvidenceMayaPhoneCall3[]; +extern u8 gGfx_BG049_WitnessJackAtGate[]; +extern u8 gGfx_BG050_WitnessJackDeadAtStudio1[]; +extern u8 gGfx_BG051_WitnessJackWearingSamuraiSuit[]; +extern u8 gGfx_BG052_WitnessVasquezPushingJackAftermath[]; +extern u8 gGfx_BG053_WitnessStaffEatingLunch[]; +extern u8 gGfx_BG054_WitnessStudio2JackAndVasquez[]; +extern u8 gGfx_BG055_WitnessCodyWitnessingSamurai[]; +extern u8 gGfx_BG056_WitnessSamuraiAtStudio2[]; +extern u8 gGfx_BG057_Witness5YearOldPhoto[]; +extern u8 gGfx_BG058_GlobalStudiosStudio2TrailerMafia[]; +extern u8 gGfx_BG059_Case3PinkPrincess[]; +extern u8 gGfx_BG060_GlobalStudiosMonkeyOnStudio2Path[]; +extern u8 gGfx_BG061_EvidenceGlobalStudiosDiagram[]; +extern u8 gGfx_BG062_WitnessWillPowerInjury[]; +extern u8 gGfx_BG063_Case3SteelSamurai[]; -extern u8 gGfx_BG064[]; -extern u8 gUnknown_08360854[]; -extern u8 gUnknown_08360D04[]; -extern u8 gGfx_BG065[]; -extern u8 gUnknown_08362544[]; -extern u8 gUnknown_083629F4[]; -extern u8 gGfx_BG066[]; -extern u8 gGfx_BG067[]; -extern u8 gGfx_BG068[]; -extern u8 gGfx_BG069[]; -extern u8 gGfx_BG070[]; -extern u8 gGfx_BG071[]; -extern u8 gGfx_BG072[]; -extern u8 gGfx_BG073[]; -extern u8 gGfx_BG074[]; -extern u8 gGfx_BG075[]; -extern u8 gGfx_BG076[]; -extern u8 gGfx_BG077[]; -extern u8 gGfx_BG078[]; -extern u8 gGfx_BG079[]; -extern u8 gGfx_BG080[]; -extern u8 gGfx_BG081[]; -extern u8 gGfx_BG082[]; -extern u8 gGfx_BG083[]; -extern u8 gGfx_BG084[]; -extern u8 gGfx_BG085[]; -extern u8 gGfx_BG086[]; -extern u8 gGfx_BG087[]; -extern u8 gGfx_BG088[]; -extern u8 gGfx_BG089[]; -extern u8 gGfx_BG090[]; -extern u8 gGfx_BG091[]; -extern u8 gGfx_BG092[]; -extern u8 gGfx_BG093[]; -extern u8 gGfx_BG094[]; -extern u8 gGfx_BG095[]; -extern u8 gGfx_BG096[]; -extern u8 gGfx_BG097[]; -extern u8 gGfx_BG098[]; -extern u8 gGfx_BG099[]; -extern u8 gGfx_BG100[]; -extern u8 gGfx_BG101[]; -extern u8 gGfx_BG102[]; -extern u8 gGfx_BG103[]; -extern u8 gGfx_BG104[]; -extern u8 gGfx_BG105[]; -extern u8 gGfx_BG106[]; -extern u8 gGfx_BG107[]; -extern u8 gGfx_BG108[]; -extern u8 gGfx_BG109[]; -extern u8 gGfx_BG110[]; -extern u8 gGfx_BG111[]; -extern u8 gUnknown_08427608[]; +extern u8 gPal_BG064_BustupPhoenix[]; +extern u8 gMap_BG064_BustupPhoenix[]; +extern u8 gGfx_BG064_BustupPhoenix[]; +extern u8 gPal_BG065_BustupEdgeworth[]; +extern u8 gMap_BG065_BustupEdgeworth[]; +extern u8 gGfx_BG065_BustupEdgeworth[]; +extern u8 gGfx_BG066_Speedlines[]; +extern u8 gGfx_BG067_CourtroomBackground[]; +extern u8 gGfx_BG068_CapcomScreen[]; +extern u8 gGfx_BG069_SteelSamuraiNight[]; +extern u8 gGfx_BG070_GourdLakeEntrance[]; +extern u8 gGfx_BG071_GourdLakePark[]; +extern u8 gGfx_BG072_GourdLakeParkNoBalloon[]; +extern u8 gGfx_BG073_GourdLakeBeach[]; +extern u8 gGfx_BG074_Case3IntroGrass[]; +extern u8 gGfx_BG075_Case3IntroTrees[]; +extern u8 gGfx_BG076_Case3IntroSteelSamuraiPosing[]; +extern u8 gGfx_BG077_GourdLakeBoatRental[]; +extern u8 gGfx_BG078_GourdLakeBoatRentalHouse[]; +extern u8 gGfx_BG079_PoliceStationLobby[]; +extern u8 gGfx_BG080_PoliceStationEvidenceStorage[]; +extern u8 gGfx_BG081_Case3IntroFaceoff[]; +extern u8 gGfx_BG082_EvidenceDL6CaseFile1[]; +extern u8 gGfx_BG083_EvidenceDL6CaseFile2[]; +extern u8 gGfx_BG084_EvidenceDL6CaseFile3[]; +extern u8 gGfx_BG085_Case4TrainStation[]; +extern u8 gGfx_BG086_Case4GourdLakeMap[]; +extern u8 gGfx_BG087_Case4LottasPhotoZoomed[]; +extern u8 gGfx_BG088_Case4ElevatorPhoto[]; +extern u8 gGfx_BG089_Case4Newspaper[]; +extern u8 gGfx_BG090_Case4BalloonLaunching[]; +extern u8 gGfx_BG091_Case4BalloonLandingInLake[]; +extern u8 gGfx_BG092_Case4LarrySearchingLake[]; +extern u8 gGfx_BG093_Case4ClassTrial[]; +extern u8 gGfx_BG094_Case4LottasPhotoFar[]; +extern u8 gGfx_BG095_Case4ClassTrialPhoenix[]; +extern u8 gGfx_BG096_Case4ClassTrialEdgeworth[]; +extern u8 gGfx_BG097_Case4ClassTrialLarry[]; +extern u8 gGfx_BG098_Case4YanniThreatening[]; +extern u8 gGfx_BG099_Case4ShootWaterFromBoat[]; +extern u8 gGfx_BG100_Case4ElevatorSuffocating[]; +extern u8 gGfx_BG101_Case4ElevatorEdgeworthThrow[]; +extern u8 gGfx_BG102_Case4ElevatorVonKarmaShot[]; +extern u8 gGfx_BG103_Case4ElevatorVonKarmaInDoor[]; +extern u8 gGfx_BG104_Case4TrainStationMayaLeaving[]; +extern u8 gGfx_BG105_TrialWon[]; +extern u8 gGfx_BG106_Case4IntroLakeOneInBoat[]; +extern u8 gGfx_BG107_Case4IntroThreatenedToShoot[]; +extern u8 gGfx_BG108_Case4IntroEdgeworthPicksUpGun[]; +extern u8 gGfx_BG109_CapcomScreenBW[]; +extern u8 gGfx_BG110_DemoTitleScreen[]; +extern u8 gGfx_BG111_DemoComingSoon[]; +extern u8 gGfx_SpeedlinesFirstAndLastColumns[]; extern u8 gGfxCourtscroll01[]; extern u8 gGfxCourtscroll02[]; diff --git a/src/bg3.c b/src/bg3.c index 35abb76..45e99f2 100644 --- a/src/bg3.c +++ b/src/bg3.c @@ -607,12 +607,12 @@ void LoadCase3IntroBackgrounds() u32 * ptr; u32 stripeSize; u32 i, j; - bgPtr = gGfx_BG069; + bgPtr = gGfx_BG069_SteelSamuraiNight; bgPtr+=0x28; DmaCopy16(3, bgPtr, PLTT+0x40, 0x20); ioRegs->lcd_bg3cnt &= ~BGCNT_256COLOR; *(u16*)®_BG3CNT &= ~BGCNT_256COLOR; // volatile causes code diff lol - bgPtr = gGfx_BG074; + bgPtr = gGfx_BG074_Case3IntroGrass; ptr = bgPtr; stripeSize = 0xF00; stripeSize /= 2; @@ -626,10 +626,10 @@ void LoadCase3IntroBackgrounds() for(i = 2; i < 11; i++) { main->bgStripeDestPtr += stripeSize; - bgPtr = gGfx_BG074 + main->bgStripeOffsets[i]; + bgPtr = gGfx_BG074_Case3IntroGrass + main->bgStripeOffsets[i]; LZ77UnCompWram(bgPtr, main->bgStripeDestPtr); } - bgPtr = gGfx_BG074; + bgPtr = gGfx_BG074_Case3IntroGrass; bgPtr += 0x28; DmaCopy16(3, bgPtr, PLTT+0x60, 0x20); gIORegisters.lcd_bg2cnt = BGCNT_PRIORITY(0) | BGCNT_CHARBASE(2) | BGCNT_SCREENBASE(30) | BGCNT_16COLOR | BGCNT_WRAP; @@ -703,7 +703,7 @@ void CopyBGDataToVram(u32 bgId) for(i = 0; i < 20; i++, j++) gBG3MapBuffer[i * 0x20 + 0x3F] = j | 0x2000; main->isBGScrolling = TRUE; - DmaCopy16(3, gUnknown_08427608, eBGDecompBuffer+0x4B00, 0x500); + DmaCopy16(3, gGfx_SpeedlinesFirstAndLastColumns, eBGDecompBuffer+0x4B00, 0x500); } if(tempBgCtrl & 0x8000) { @@ -739,10 +739,10 @@ void CopyBGDataToVram(u32 bgId) DmaCopy16(3, bgData, BG_PLTT+0x40, 0x20); if(gBackgroundTable[bgId].controlBits & BG_MODE_SPECIAL_SPEEDLINE) { - src = gGfx_BG064; + src = gPal_BG064_BustupPhoenix; dst = (void*)BG_PLTT+0x1C0; DmaCopy16(3, src, dst, 0x20); - src = gGfx_BG065; + src = gPal_BG065_BustupEdgeworth; dst = (void*)BG_PLTT+0x1E0; DmaCopy16(3, src, dst, 0x20); src = eBGDecompBuffer + 0x4B00; diff --git a/src/court.c b/src/court.c index 5ebdee5..7f4fe89 100644 --- a/src/court.c +++ b/src/court.c @@ -73,9 +73,9 @@ void CourtInit(struct Main * main) ioRegs->lcd_bg3cnt = BGCNT_PRIORITY(3) | BGCNT_CHARBASE(1) | BGCNT_SCREENBASE(31) | BGCNT_MOSAIC | BGCNT_256COLOR | BGCNT_WRAP | BGCNT_TXT256x256; DmaCopy16(3, gUnusedAsciiCharSet, VRAM + 0x3800, 0x800); DmaCopy16(3, gUnknown_08186540, VRAM, 0x1000); - DmaCopy16(3, &gUnknown_081942C0[0], OBJ_PLTT+0x100, 0x20); + DmaCopy16(3, &gPalInvestigationExamineCursors[0], OBJ_PLTT+0x100, 0x20); DmaCopy16(3, gGfx4bppTrialLife, OBJ_VRAM0 + 0x3780, 0x80); - DmaCopy16(3, gUnknown_081940E0, OBJ_PLTT+0x60, 0x20); + DmaCopy16(3, gPalCrossExaminationUI, OBJ_PLTT+0x60, 0x20); DecompressBackgroundIntoBuffer(1); CopyBGDataToVram(1); CopyBGDataToVram(0xFF); @@ -234,7 +234,7 @@ void TestimonyProcess(struct Main * main) void TestimonyInit(struct Main * main) { DmaCopy16(3, gGfx4bppTestimonyTextTiles, OBJ_VRAM0+0x3000, 0x800); - DmaCopy16(3, gUnknown_08194280, OBJ_PLTT+0xA0, 0x20); + DmaCopy16(3, gPalTrialTestimonyTextTiles, OBJ_PLTT+0xA0, 0x20); gTestimony.timer = 0; main->process[GAME_PROCESS_STATE] = TESTIMONY_ANIM; } @@ -364,9 +364,9 @@ void QuestioningProcess(struct Main * main) void QuestioningInit(struct Main * main) { DmaCopy16(3, gGfx4bppTrialLife, OBJ_VRAM0+0x3780, 0x80); - DmaCopy16(3, gUnknown_081940E0, OBJ_PLTT+0x60, 0x20); - DmaCopy16(3, gUnknown_081900C0, OBJ_VRAM0+0x3000, 0x400); - DmaCopy16(3, gUnknown_081942A0, OBJ_PLTT+0xA0, 0x20); + DmaCopy16(3, gPalCrossExaminationUI, OBJ_PLTT+0x60, 0x20); + DmaCopy16(3, gGfxTrialPressPresentButtons, OBJ_VRAM0+0x3000, 0x400); + DmaCopy16(3, gPalTrialPressPresentButtons, OBJ_PLTT+0xA0, 0x20); DmaCopy16(3, gGfx4bppTestimonyArrows, 0x1A0, 0x80); // ! WHAT, HOW DmaCopy16(3, gGfx4bppTestimonyArrows + 12 * TILE_SIZE_4BPP, 0x220, 0x80); // ! WHAT, HOW main->testimonyBeginningSection = gScriptContext.currentSection; @@ -695,8 +695,8 @@ void VerdictProcess(struct Main * main) break; } case VERDICT_INIT_CONFETTI: { // B3C8 - DmaCopy16(3, gUnknown_081940A0, OBJ_VRAM0+0x1F80, 0x20); - DmaCopy16(3, gUnknown_08194640, OBJ_PLTT+0xA0, 0x80); + DmaCopy16(3, gGfxTrialConfetti, OBJ_VRAM0+0x1F80, 0x20); + DmaCopy16(3, gPalConfetti, OBJ_PLTT+0xA0, 0x80); main->process[GAME_PROCESS_STATE]++; break; } diff --git a/src/court_record.c b/src/court_record.c index c77c3c6..ce326b0 100644 --- a/src/court_record.c +++ b/src/court_record.c @@ -1018,14 +1018,14 @@ void CourtRecordChangeRecord(struct Main * main, struct CourtRecord * courtRecor if(courtRecord->flags & COURT_RECORD_VIEW_PROFILES) { courtRecord->flags &= ~COURT_RECORD_VIEW_PROFILES; - DmaCopy16(3, gUnknown_081906C0, OBJ_VRAM0+0x3500, TILE_SIZE_4BPP*16); + DmaCopy16(3, gGfxCourtRecordProfilesText, OBJ_VRAM0+0x3500, TILE_SIZE_4BPP*16); courtRecord->displayItemCount = courtRecord->evidenceCount; courtRecord->displayItemList = courtRecord->evidenceList; } else { courtRecord->flags |= COURT_RECORD_VIEW_PROFILES; - DmaCopy16(3, gUnknown_081908C0, OBJ_VRAM0+0x3500, 0x200); + DmaCopy16(3, gGfxCourtRecordEvidenceText, OBJ_VRAM0+0x3500, 0x200); courtRecord->displayItemCount = courtRecord->profileCount; courtRecord->displayItemList = courtRecord->profileList; } @@ -1302,9 +1302,9 @@ void CourtRecordTakeThatSpecial(struct Main * main, struct CourtRecord * courtRe gTestimony.timer = 6; evidenceId = courtRecord->displayItemList[courtRecord->selectedItem]; offset = gEvidenceProfileData[evidenceId].evidenceImageId * (TILE_SIZE_4BPP * 64 + 0x20); - temp = (uintptr_t)gUnknown_081B290C + offset; //! Evil, uses a u32 for this pointer keep in mind and also global define + temp = (uintptr_t)gGfxEvidenceProfilePictures + offset; //! Evil, uses a u32 for this pointer keep in mind and also global define DmaCopy16(3, temp, OBJ_PLTT+0x20, 0x20); - temp = (uintptr_t)gUnknown_081B290C + offset + 0x20; + temp = (uintptr_t)gGfxEvidenceProfilePictures + offset + 0x20; DmaCopy16(3, temp, OBJ_VRAM0+0x1000, TILE_SIZE_4BPP * 64); oam->attr0 = SPRITE_ATTR0(16, ST_OAM_AFFINE_OFF, ST_OAM_OBJ_NORMAL, FALSE, ST_OAM_4BPP, ST_OAM_SQUARE); oam->attr1 = SPRITE_ATTR1_NONAFFINE(88, FALSE, FALSE, 3); @@ -1477,11 +1477,11 @@ void LoadEvidenceWindowGraphics() DmaCopy16(3, gGfx4bppTestimonyArrows, OBJ_VRAM0+0x3400, TILE_SIZE_4BPP*4); DmaCopy16(3, gGfx4bppTestimonyArrows + TILE_SIZE_4BPP*4 * 3, OBJ_VRAM0+0x3480, TILE_SIZE_4BPP*4); DmaCopy16(3, gGfx4bppControllerButtons, OBJ_VRAM0+0x3800, TILE_SIZE_4BPP*16); - DmaCopy16(3, gUnknown_081904C0, OBJ_VRAM0+0x3A00, TILE_SIZE_4BPP*16); - DmaCopy16(3, gUnknown_081906C0, OBJ_VRAM0+0x3500, TILE_SIZE_4BPP*16); - DmaCopy16(3, gUnknown_081940E0, OBJ_PLTT+0x60, 0x20); - DmaCopy16(3, gUnknown_08194240, OBJ_PLTT+0x80, 0x20); - DmaCopy16(3, gGfxPalEvidenceProfileDesc, OBJ_PLTT+0x40, 0x20); + DmaCopy16(3, gGfxCourtRecordPresentBackText, OBJ_VRAM0+0x3A00, TILE_SIZE_4BPP*16); + DmaCopy16(3, gGfxCourtRecordProfilesText, OBJ_VRAM0+0x3500, TILE_SIZE_4BPP*16); + DmaCopy16(3, gPalCrossExaminationUI, OBJ_PLTT+0x60, 0x20); + DmaCopy16(3, gPalCourtRecordControlsBlurb, OBJ_PLTT+0x80, 0x20); + DmaCopy16(3, gPalEvidenceProfileDesc, OBJ_PLTT+0x40, 0x20); } void UpdateRecordSprites(struct CourtRecord * courtRecord) @@ -1530,9 +1530,9 @@ void LoadEvidenceGraphics(u32 evidenceId) u8 * src; offset = gEvidenceProfileData[evidenceId].evidenceImageId * (TILE_SIZE_4BPP * 64 + 0x20); - src = gUnknown_081B290C + offset; + src = gGfxEvidenceProfilePictures + offset; DmaCopy16(3, src, OBJ_PLTT+0x20, 0x20); - src = gUnknown_081B290C + offset + 0x20; + src = gGfxEvidenceProfilePictures + offset + 0x20; DmaCopy16(3, src, OBJ_VRAM0+0x5000, TILE_SIZE_4BPP * 64); src = gEvidenceProfileData[evidenceId].descriptionTiles; LZ77UnCompWram(src, eUnknown_0200AFC0); @@ -1885,9 +1885,9 @@ void LoadItemPlateGfx(struct Main * main) u8 * src; offset = gEvidenceProfileData[main->itemPlateEvidenceId].evidenceImageId * (TILE_SIZE_4BPP * 64 + 0x20); - src = gUnknown_081B290C + offset; + src = gGfxEvidenceProfilePictures + offset; DmaCopy16(3, src, OBJ_PLTT+0x20, 0x20); - src = gUnknown_081B290C + offset + 0x20; + src = gGfxEvidenceProfilePictures + offset + 0x20; DmaCopy16(3, src, OBJ_VRAM0+0x1000, TILE_SIZE_4BPP * 64); } diff --git a/src/data/background.h b/src/data/background.h index f5ab189..4cb452e 100644 --- a/src/data/background.h +++ b/src/data/background.h @@ -3,451 +3,451 @@ const struct Background gBackgroundTable[] = { { - .bgData = gGfx_BG000, + .bgData = gGfx_BG000_FeyCoMurderNight, .controlBits = BG_MODE_SIZE_480x160 | BG_MODE_HSCROLL_RIGHT | BG_MODE_8BPP, }, { - .bgData = gGfx_BG001, + .bgData = gGfx_BG001_WrightCoOfficeDay, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_8BPP, }, { - .bgData = gGfx_BG002, + .bgData = gGfx_BG002_CourtDefendantLobby, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_8BPP, }, { - .bgData = gGfx_BG003, + .bgData = gGfx_BG003_CourtDefenseBench, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG004, + .bgData = gGfx_BG004_CourtProsecutionBench, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG005, + .bgData = gGfx_BG005_CourtWitnessStand, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG006, + .bgData = gGfx_BG006_CourtRoom, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_8BPP, }, { - .bgData = gGfx_BG007, + .bgData = gGfx_BG007_CourtCoCounsel, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_8BPP, }, { - .bgData = gGfx_BG008, + .bgData = gGfx_BG008_CourtJudgeSeat, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_8BPP, }, { - .bgData = gGfx_BG009, + .bgData = gGfx_BG009_FeyCoEntranceNight, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_8BPP, }, { - .bgData = gGfx_BG010, + .bgData = gGfx_BG010_Case2MayaSeeingDeadMia, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_8BPP, }, { - .bgData = gGfx_BG011, + .bgData = gGfx_BG011_GlobalStudiosStudioPath, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_8BPP, }, { - .bgData = gGfx_BG012, + .bgData = gGfx_BG012_GlobalStudiosStaffArea, .controlBits = BG_MODE_SIZE_480x160 | BG_MODE_HSCROLL_RIGHT | BG_MODE_8BPP, }, { - .bgData = gGfx_BG013, + .bgData = gGfx_BG013_WitnessMiaDodgingRight, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG014, + .bgData = gGfx_BG014_WitnessMiaDodgingLeft, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG015, + .bgData = gGfx_BG015_EvidenceFeyCoDiagram, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG016, + .bgData = gGfx_BG016_WitnessAprilGettingRoomService, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG017, + .bgData = gGfx_BG017_Case2MiaDeadOnGround, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_8BPP, }, { - .bgData = gGfx_BG018, + .bgData = gGfx_BG018_Case2PhoenixMayaMia, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_8BPP, }, { - .bgData = gGfx_BG019, + .bgData = gGfx_BG019_GlobalStudiosStudio2Trailer, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_8BPP, }, { - .bgData = gGfx_BG020, + .bgData = gGfx_BG020_Case2AprilCallingPolice, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_8BPP, }, { - .bgData = gGfx_BG021, + .bgData = gGfx_BG021_Case2ReddHittingMia, .controlBits = BG_MODE_SIZE_240x320 | BG_MODE_VSCROLL_TOP | BG_MODE_8BPP, }, { - .bgData = gGfx_BG022, + .bgData = gGfx_BG022_Case2MiaBeingAttacked, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_8BPP, }, { - .bgData = gGfx_BG023, + .bgData = gGfx_BG023_Case2ReddHoldingThinker, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG024, + .bgData = gGfx_BG024_GlobalStudiosDressingRoom, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_8BPP, }, { - .bgData = gGfx_BG025, + .bgData = gGfx_BG025_GlobalStudiosFrontGate, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_8BPP, }, { - .bgData = gGfx_BG026, + .bgData = gGfx_BG026_GlobalStudiosStudio1, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_8BPP, }, { - .bgData = gGfx_BG027, + .bgData = gGfx_BG027_Gavel2, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_8BPP, }, { - .bgData = gGfx_BG028, + .bgData = gGfx_BG028_Gavel3, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_8BPP, }, { - .bgData = gGfx_BG029, + .bgData = gGfx_BG029_EvidenceFeyCoDiagramLight, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG030, + .bgData = gGfx_BG030_DetentionCenter, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_8BPP, }, { - .bgData = gGfx_BG031, + .bgData = gGfx_BG031_BlueCorpCeoOffice, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_8BPP, }, { - .bgData = gGfx_BG032, + .bgData = gGfx_BG032_GatewaterHotelRoom, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_8BPP, }, { - .bgData = gGfx_BG033, + .bgData = gGfx_BG033_Case1FrankHoldingThinker, .controlBits = BG_MODE_SIZE_240x320 | BG_MODE_VSCROLL_TOP | BG_MODE_8BPP, }, { - .bgData = gGfx_BG034, + .bgData = gGfx_BG034_Case1CindyDeadOnFloor, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_8BPP, }, { - .bgData = gGfx_BG035, + .bgData = gGfx_BG035_Case1CindyAndFrank, .controlBits = BG_MODE_SIZE_240x320 | BG_MODE_VSCROLL_TOP | BG_MODE_8BPP, }, { - .bgData = gGfx_BG036, + .bgData = gGfx_BG036_Case1FrankCloseup1, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_8BPP, }, { - .bgData = gGfx_BG037, + .bgData = gGfx_BG037_Case1FrankCloseup2, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_8BPP, }, { - .bgData = gGfx_BG038, + .bgData = gGfx_BG038_Case1FrankCloseup3, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_8BPP, }, { - .bgData = gGfx_BG039, + .bgData = gGfx_BG039_GrossbergLawOfficesPainting, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_8BPP, }, { - .bgData = gGfx_BG040, + .bgData = gGfx_BG040_GrossbergLawOfficesNoPainting, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_8BPP, }, { - .bgData = gGfx_BG041, + .bgData = gGfx_BG041_WitnessCindyFindingFrank, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG042, + .bgData = gGfx_BG042_WitnessFrankWitnessingLarry, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG043, + .bgData = gGfx_BG043_WitnessFrankFindingCindy, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG044, + .bgData = gGfx_BG044_GlobalStudiosStudio2, .controlBits = BG_MODE_SIZE_480x160 | BG_MODE_HSCROLL_LEFT | BG_MODE_8BPP, }, { - .bgData = gGfx_BG045, + .bgData = gGfx_BG045_EvidenceMayaPhoneCall1, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG046, + .bgData = gGfx_BG046_EvidenceMayaPhoneCall2, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG047, + .bgData = gGfx_BG047_Gavel1, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_8BPP, }, { - .bgData = gGfx_BG048, + .bgData = gGfx_BG048_EvidenceMayaPhoneCall3, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG049, + .bgData = gGfx_BG049_WitnessJackAtGate, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG050, + .bgData = gGfx_BG050_WitnessJackDeadAtStudio1, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG051, + .bgData = gGfx_BG051_WitnessJackWearingSamuraiSuit, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG052, + .bgData = gGfx_BG052_WitnessVasquezPushingJackAftermath, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG053, + .bgData = gGfx_BG053_WitnessStaffEatingLunch, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG054, + .bgData = gGfx_BG054_WitnessStudio2JackAndVasquez, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG055, + .bgData = gGfx_BG055_WitnessCodyWitnessingSamurai, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG056, + .bgData = gGfx_BG056_WitnessSamuraiAtStudio2, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG057, + .bgData = gGfx_BG057_Witness5YearOldPhoto, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG058, + .bgData = gGfx_BG058_GlobalStudiosStudio2TrailerMafia, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_8BPP, }, { - .bgData = gGfx_BG059, + .bgData = gGfx_BG059_Case3PinkPrincess, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_8BPP, }, { - .bgData = gGfx_BG060, + .bgData = gGfx_BG060_GlobalStudiosMonkeyOnStudio2Path, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_8BPP, }, { - .bgData = gGfx_BG061, + .bgData = gGfx_BG061_EvidenceGlobalStudiosDiagram, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG062, + .bgData = gGfx_BG062_WitnessWillPowerInjury, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG063, + .bgData = gGfx_BG063_Case3SteelSamurai, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_8BPP, }, { - .bgData = gGfx_BG064, + .bgData = gPal_BG064_BustupPhoenix, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG065, + .bgData = gPal_BG065_BustupEdgeworth, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG066, + .bgData = gGfx_BG066_Speedlines, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_SPECIAL_SPEEDLINE | BG_MODE_4BPP, }, { - .bgData = gGfx_BG067, + .bgData = gGfx_BG067_CourtroomBackground, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG068, + .bgData = gGfx_BG068_CapcomScreen, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG069, + .bgData = gGfx_BG069_SteelSamuraiNight, .controlBits = BG_MODE_SIZE_240x320 | BG_MODE_VSCROLL_TOP | BG_MODE_4BPP, }, { - .bgData = gGfx_BG070, + .bgData = gGfx_BG070_GourdLakeEntrance, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_8BPP, }, { - .bgData = gGfx_BG071, + .bgData = gGfx_BG071_GourdLakePark, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_8BPP, }, { - .bgData = gGfx_BG072, + .bgData = gGfx_BG072_GourdLakeParkNoBalloon, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_8BPP, }, { - .bgData = gGfx_BG073, + .bgData = gGfx_BG073_GourdLakeBeach, .controlBits = BG_MODE_SIZE_480x160 | BG_MODE_HSCROLL_LEFT | BG_MODE_8BPP, }, { - .bgData = gGfx_BG069, + .bgData = gGfx_BG069_SteelSamuraiNight, .controlBits = BG_MODE_SIZE_240x320 | BG_MODE_NO_SCROLL | BG_MODE_SCROLL_SPECIAL_SLOW | BG_MODE_4BPP, }, { - .bgData = gGfx_BG069, + .bgData = gGfx_BG069_SteelSamuraiNight, .controlBits = BG_MODE_SIZE_240x320 | BG_MODE_NO_SCROLL | BG_MODE_SCROLL_SPECIAL_SLOW | BG_MODE_4BPP, }, { - .bgData = gGfx_BG076, + .bgData = gGfx_BG076_Case3IntroSteelSamuraiPosing, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG077, + .bgData = gGfx_BG077_GourdLakeBoatRental, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_8BPP, }, { - .bgData = gGfx_BG078, + .bgData = gGfx_BG078_GourdLakeBoatRentalHouse, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_8BPP, }, { - .bgData = gGfx_BG079, + .bgData = gGfx_BG079_PoliceStationLobby, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_8BPP, }, { - .bgData = gGfx_BG080, + .bgData = gGfx_BG080_PoliceStationEvidenceStorage, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_8BPP, }, { - .bgData = gGfx_BG081, + .bgData = gGfx_BG081_Case3IntroFaceoff, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG082, + .bgData = gGfx_BG082_EvidenceDL6CaseFile1, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG083, + .bgData = gGfx_BG083_EvidenceDL6CaseFile2, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG084, + .bgData = gGfx_BG084_EvidenceDL6CaseFile3, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG085, + .bgData = gGfx_BG085_Case4TrainStation, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_8BPP, }, { - .bgData = gGfx_BG086, + .bgData = gGfx_BG086_Case4GourdLakeMap, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG087, + .bgData = gGfx_BG087_Case4LottasPhotoZoomed, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG088, + .bgData = gGfx_BG088_Case4ElevatorPhoto, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG089, + .bgData = gGfx_BG089_Case4Newspaper, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_8BPP, }, { - .bgData = gGfx_BG090, + .bgData = gGfx_BG090_Case4BalloonLaunching, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG091, + .bgData = gGfx_BG091_Case4BalloonLandingInLake, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG092, + .bgData = gGfx_BG092_Case4LarrySearchingLake, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG093, + .bgData = gGfx_BG093_Case4ClassTrial, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_8BPP, }, { - .bgData = gGfx_BG094, + .bgData = gGfx_BG094_Case4LottasPhotoFar, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG095, + .bgData = gGfx_BG095_Case4ClassTrialPhoenix, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_8BPP, }, { - .bgData = gGfx_BG096, + .bgData = gGfx_BG096_Case4ClassTrialEdgeworth, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_8BPP, }, { - .bgData = gGfx_BG097, + .bgData = gGfx_BG097_Case4ClassTrialLarry, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_8BPP, }, { - .bgData = gGfx_BG098, + .bgData = gGfx_BG098_Case4YanniThreatening, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG099, + .bgData = gGfx_BG099_Case4ShootWaterFromBoat, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG100, + .bgData = gGfx_BG100_Case4ElevatorSuffocating, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG101, + .bgData = gGfx_BG101_Case4ElevatorEdgeworthThrow, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG102, + .bgData = gGfx_BG102_Case4ElevatorVonKarmaShot, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG103, + .bgData = gGfx_BG103_Case4ElevatorVonKarmaInDoor, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG104, + .bgData = gGfx_BG104_Case4TrainStationMayaLeaving, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_8BPP, }, { - .bgData = gGfx_BG105, + .bgData = gGfx_BG105_TrialWon, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_8BPP, }, { - .bgData = gGfx_BG106, + .bgData = gGfx_BG106_Case4IntroLakeOneInBoat, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG107, + .bgData = gGfx_BG107_Case4IntroThreatenedToShoot, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG108, + .bgData = gGfx_BG108_Case4IntroEdgeworthPicksUpGun, .controlBits = BG_MODE_SIZE_240x320 | BG_MODE_VSCROLL_TOP | BG_MODE_8BPP, }, { - .bgData = gGfx_BG109, + .bgData = gGfx_BG109_CapcomScreenBW, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_4BPP, }, { - .bgData = gGfx_BG110, + .bgData = gGfx_BG110_DemoTitleScreen, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_8BPP, }, { - .bgData = gGfx_BG111, + .bgData = gGfx_BG111_DemoComingSoon, .controlBits = BG_MODE_SIZE_240x160 | BG_MODE_NO_SCROLL | BG_MODE_8BPP, }, }; diff --git a/src/episode_load_processes.c b/src/episode_load_processes.c index 7b37087..f41dff8 100644 --- a/src/episode_load_processes.c +++ b/src/episode_load_processes.c @@ -22,9 +22,9 @@ void EpisodeLoadGfx(struct Main * main) struct OamAttrs * oam; u32 i, j; - LZ77UnCompWram(gUnknown_081946C0, eBGDecompBuffer); + LZ77UnCompWram(gGfx4lzEpisodeSelectOptions, eBGDecompBuffer); DmaCopy16(3, eBGDecompBuffer, OBJ_VRAM0+0x3400, 0x2800); - DmaCopy16(3, gGfxPalChoiceSelected, OBJ_PLTT+0x120, 0x40); + DmaCopy16(3, gPalChoiceSelected, OBJ_PLTT+0x120, 0x40); DmaCopy16(3, gUnknown_08186540, VRAM, 0x1000); DecompressBackgroundIntoBuffer(0x43); CopyBGDataToVram(0x43); @@ -611,8 +611,8 @@ void ContinueSaveProcess(struct Main * main) { main->saveContinueFlags = gSaveDataBuffer.main.saveContinueFlags; main->scenarioIdx = gSaveDataBuffer.main.scenarioIdx; DmaCopy16(3, gUnknown_08186540, BG_CHAR_ADDR(0), 0x1000); - DmaCopy16(3, gUnknown_081954A8, OBJ_VRAM0 + 0x3400, 0x1000); - DmaCopy16(3, gGfxPalChoiceSelected, OBJ_PLTT + 0x120, 0x40); + DmaCopy16(3, gGfxFromSaveOrBeginning, OBJ_VRAM0 + 0x3400, 0x1000); + DmaCopy16(3, gPalChoiceSelected, OBJ_PLTT + 0x120, 0x40); DecompressBackgroundIntoBuffer(0x43); CopyBGDataToVram(0x43); main->animationFlags &= ~3; @@ -732,17 +732,17 @@ void ContinueSaveProcess(struct Main * main) { DmaCopy16(3, i, BG_PLTT, 0x200); DmaCopy16(3, &gSaveDataBuffer.main, &gMain, sizeof(gMain)); LoadCurrentScriptIntoRam(); - DmaCopy16(3, gUnknown_081942C0, OBJ_PLTT + 0x100, 0x20); + DmaCopy16(3, gPalInvestigationExamineCursors, OBJ_PLTT + 0x100, 0x20); DmaCopy16(3, &gSaveDataBuffer.talkData, &gTalkData, sizeof(gTalkData)); RestoreAnimationsFromBuffer(gSaveDataBuffer.backupAnimations); if (main->process[GAME_PROCESS] == INVESTIGATION_PROCESS) { DmaCopy16(3, gGfx4bppInvestigationActions, OBJ_VRAM0 + 0x2000, 0x1000); - DmaCopy16(3, gUnknown_08194200, OBJ_PLTT + 0xA0, 0x40); + DmaCopy16(3, gPalActionButtons, OBJ_PLTT + 0xA0, 0x40); DmaCopy16(3, gGfx4bppInvestigationScrollButton, OBJ_VRAM0 + 0x3000, 0x200); - DmaCopy16(3, gUnknown_08194260, OBJ_PLTT + 0xE0, 0x20); - DmaCopy16(3, gUnknown_08190AC0, OBJ_VRAM0 + 0x3200, 0x200); - DmaCopy16(3, gGfxPalChoiceSelected, OBJ_PLTT + 0x120, 0x40); + DmaCopy16(3, gPalInvestigationScrollPrompt, OBJ_PLTT + 0xE0, 0x20); + DmaCopy16(3, gGfxInvestigationExamineCursor, OBJ_VRAM0 + 0x3200, 0x200); + DmaCopy16(3, gPalChoiceSelected, OBJ_PLTT + 0x120, 0x40); if (main->process[GAME_PROCESS_VAR1] == 3) { // 9E82 @@ -755,18 +755,18 @@ void ContinueSaveProcess(struct Main * main) { } else { // 9F0E DmaCopy16(3, gGfx4bppTrialLife, OBJ_VRAM0 + 0x3780, 0x80); - DmaCopy16(3, gUnknown_081940E0, OBJ_PLTT + 0x60, 0x20); - DmaCopy16(3, gUnknown_0824696C, OBJ_PLTT + 0xC0, 0x20); + DmaCopy16(3, gPalCrossExaminationUI, OBJ_PLTT + 0x60, 0x20); + DmaCopy16(3, gPalMapMarkersPalette, OBJ_PLTT + 0xC0, 0x20); if (main->process[GAME_PROCESS] == TESTIMONY_PROCESS) { DmaCopy16(3, gGfx4bppTestimonyTextTiles, OBJ_VRAM0 + 0x3000, 0x800); - DmaCopy16(3, gUnknown_08194280, OBJ_PLTT + 0xA0, 0x20); + DmaCopy16(3, gPalTrialTestimonyTextTiles, OBJ_PLTT + 0xA0, 0x20); } else /* 9F84 */ if (main->process[GAME_PROCESS] == QUESTIONING_PROCESS) { // thonk DmaCopy16(3, gGfx4bppTrialLife, OBJ_VRAM0 + 0x3780, 0x80); // double thonk - DmaCopy16(3, gUnknown_081940E0, OBJ_PLTT + 0x60, 0x20); - DmaCopy16(3, gUnknown_081900C0, OBJ_VRAM0 + 0x3000, 0x400); - DmaCopy16(3, gUnknown_081942A0, OBJ_PLTT + 0xA0, 0x20); + DmaCopy16(3, gPalCrossExaminationUI, OBJ_PLTT + 0x60, 0x20); + DmaCopy16(3, gGfxTrialPressPresentButtons, OBJ_VRAM0 + 0x3000, 0x400); + DmaCopy16(3, gPalTrialPressPresentButtons, OBJ_PLTT + 0xA0, 0x20); // mega thonk DmaCopy16(3, gGfx4bppTestimonyArrows, 0x1A0, 0x80); DmaCopy16(3, gGfx4bppTestimonyArrows + TILE_SIZE_4BPP*4 * 3, 0x220, 0x80); @@ -795,7 +795,7 @@ void ContinueSaveProcess(struct Main * main) { } // A0C4 if (gScriptContext.flags & 0x400) { - DmaCopy16(3, gUnknown_08190AC0, OBJ_VRAM0 + 0x1F80, 0x80); + DmaCopy16(3, gGfxInvestigationExamineCursor, OBJ_VRAM0 + 0x1F80, 0x80); } // A0DE DmaCopy16(3, gSaveDataBuffer.oam, gOamObjects, sizeof(gOamObjects)); diff --git a/src/gameover_process.c b/src/gameover_process.c index 336da74..275381f 100644 --- a/src/gameover_process.c +++ b/src/gameover_process.c @@ -36,10 +36,10 @@ void GameOverScreenProcess(struct Main *main) oam->attr0 = SPRITE_ATTR0(48, ST_OAM_AFFINE_OFF, ST_OAM_OBJ_NORMAL, FALSE, ST_OAM_4BPP, ST_OAM_SQUARE); oam->attr1 = SPRITE_ATTR1_NONAFFINE(DISPLAY_WIDTH+24, FALSE, FALSE, 3); oam->attr2 = SPRITE_ATTR2(0x1E0, 0, 5); - DmaCopy16(3, gUnknown_081911C0, VRAM+0x1400, 0x2E0); - DmaCopy16(3, gUnknown_08194500, PLTT+0x20, 0x20); - DmaCopy16(3, gUnknown_08192CA0, VRAM+0x13400, 0x1000); - DmaCopy16(3, gUnknown_08194560, PLTT+0x2A0, 0x20); + DmaCopy16(3, gGfxTrialGameOverDoors, VRAM+0x1400, 0x2E0); + DmaCopy16(3, gPalTrialGameOverDoors, PLTT+0x20, 0x20); + DmaCopy16(3, gGfxTrialGameOverText, VRAM+0x13400, 0x1000); + DmaCopy16(3, gPalTrialGameOverText, PLTT+0x2A0, 0x20); for(i = 0; i < 0x400; i++) { gBG2MapBuffer[i] = 0; diff --git a/src/investigation.c b/src/investigation.c index 595e14e..ee84f93 100644 --- a/src/investigation.c +++ b/src/investigation.c @@ -70,12 +70,12 @@ void InvestigationInit(struct Main * main, struct InvestigationStruct * investig DmaCopy16(3, gUnusedAsciiCharSet, VRAM + 0x3800, 0x800); DmaCopy16(3, gUnknown_08186540, VRAM, 0x1000); DmaCopy16(3, gGfx4bppInvestigationActions, OBJ_VRAM0 + 0x2000, 0x1000); - DmaCopy16(3, gUnknown_08194200, OBJ_PLTT+0xA0, 0x40); + DmaCopy16(3, gPalActionButtons, OBJ_PLTT+0xA0, 0x40); DmaCopy16(3, gGfx4bppInvestigationScrollButton, OBJ_VRAM0 + 0x3000, 0x200); - DmaCopy16(3, gUnknown_08194260, OBJ_PLTT+0xE0, 0x20); - DmaCopy16(3, gUnknown_08190AC0, OBJ_VRAM0 + 0x3200, 0x200); - DmaCopy16(3, gUnknown_081942C0, OBJ_PLTT+0x100, 0x20); - DmaCopy16(3, gGfxPalChoiceSelected, OBJ_PLTT+0x120, 0x40); + DmaCopy16(3, gPalInvestigationScrollPrompt, OBJ_PLTT+0xE0, 0x20); + DmaCopy16(3, gGfxInvestigationExamineCursor, OBJ_VRAM0 + 0x3200, 0x200); + DmaCopy16(3, gPalInvestigationExamineCursors, OBJ_PLTT+0x100, 0x20); + DmaCopy16(3, gPalChoiceSelected, OBJ_PLTT+0x120, 0x40); oam = &gOamObjects[49]; for(i = 0; i < 4; i++) { @@ -245,7 +245,7 @@ void InvestigationMain(struct Main * main, struct InvestigationStruct * investig StartAnimationBlend(0xC, 1); investigation->pointerColorCounter = 0; investigation->pointerColor = 0; - DmaCopy16(3, gUnknown_081942C0, OBJ_PLTT+0x100, 0x20); + DmaCopy16(3, gPalInvestigationExamineCursors, OBJ_PLTT+0x100, 0x20); } main->process[GAME_PROCESS_STATE] = INVESTIGATION_INSPECT + investigation->selectedAction; main->process[GAME_PROCESS_VAR2] = 0; @@ -548,7 +548,7 @@ void InvestigationInspect(struct Main * main, struct InvestigationStruct * inves investigation->pointerColorCounter = 0; investigation->pointerColor += 1; investigation->pointerColor &= 0xF; - DmaCopy16(3, gUnknown_081942C0+investigation->pointerColor*32, OBJ_PLTT+0x100, 0x20); + DmaCopy16(3, gPalInvestigationExamineCursors+investigation->pointerColor*32, OBJ_PLTT+0x100, 0x20); } break; case 2: @@ -605,7 +605,7 @@ void InvestigationMove(struct Main * main, struct InvestigationStruct * investig if(*moveLocations != 0xFF) { investigation->activeOptions[i] = TRUE; - moveButtonTiles = gUnknown_081FD96C+*moveLocations*0x800; //TODO: label vs value? + moveButtonTiles = gGfxLocationChoices+*moveLocations*0x800; //TODO: label vs value? DmaCopy16(3, moveButtonTiles, vram, 0x800); for(j = 0; j < 2; j++) { @@ -817,7 +817,7 @@ void InvestigationMove(struct Main * main, struct InvestigationStruct * investig if(*moveLocations != 0xFF) { investigation->activeOptions[i] = TRUE; - moveButtonTiles = gUnknown_081FD96C+*moveLocations*0x800; //TODO: label vs value? + moveButtonTiles = gGfxLocationChoices+*moveLocations*0x800; //TODO: label vs value? DmaCopy16(3, moveButtonTiles, vram, 0x800); for(j = 0; j < 2; j++) { @@ -903,7 +903,7 @@ void InvestigationTalk(struct Main * main, struct InvestigationStruct * investig if(*icons != 0xFF) { investigation->activeOptions[i] = TRUE; - temp = (uintptr_t)gUnknown_0820816C + *icons * 0x800; + temp = (uintptr_t)gGfxTalkChoices + *icons * 0x800; DmaCopy16(3, temp, vram, 0x800); for(j = 0; j < 2; j++) { @@ -924,8 +924,8 @@ void InvestigationTalk(struct Main * main, struct InvestigationStruct * investig } icons++; } - DmaCopy16(3, gUnknown_08190FC0, OBJ_VRAM0+0x5400, 0x200); - DmaCopy16(3, gUnknown_081944E0, PLTT+0x360, 0x20); + DmaCopy16(3, gGfxInvestigationCheckmark, OBJ_VRAM0+0x5400, 0x200); + DmaCopy16(3, gPalInvestigationCheckmark, PLTT+0x360, 0x20); investigation->selectedOption = 0; main->process[GAME_PROCESS_VAR1]++; main->process[GAME_PROCESS_VAR2] = 0; @@ -964,8 +964,8 @@ void InvestigationTalk(struct Main * main, struct InvestigationStruct * investig case 3: { bool32 showTalkTick; - DmaCopy16(3, gUnknown_08190FC0, OBJ_VRAM0+0x5400, 0x200); - DmaCopy16(3, gUnknown_081944E0, OBJ_PLTT+0x160, 0x20); + DmaCopy16(3, gGfxInvestigationCheckmark, OBJ_VRAM0+0x5400, 0x200); + DmaCopy16(3, gPalInvestigationCheckmark, OBJ_PLTT+0x160, 0x20); for(talkData = gTalkData; talkData->roomId != 0xFF; talkData++) { if(main->currentRoomId == talkData->roomId @@ -1222,7 +1222,7 @@ void InvestigationTalk(struct Main * main, struct InvestigationStruct * investig if(*icons != 0xFF) { investigation->activeOptions[i] = TRUE; - temp = (uintptr_t)gUnknown_0820816C + *icons * 0x800; + temp = (uintptr_t)gGfxTalkChoices + *icons * 0x800; DmaCopy16(3, temp, vram, 0x800); for(j = 0; j < 2; j++) { @@ -1290,7 +1290,7 @@ void InvestigationTalk(struct Main * main, struct InvestigationStruct * investig if(*icons != 0xFF) { investigation->activeOptions[i] = TRUE; - temp = (uintptr_t)gUnknown_0820816C + *icons * 0x800; + temp = (uintptr_t)gGfxTalkChoices + *icons * 0x800; DmaCopy16(3, temp, vram, 0x800); for(j = 0; j < 2; j++) { @@ -1489,7 +1489,7 @@ _0800C9D8: .4byte gTalkData\n\ _0800C9DC: .4byte gOamObjects+0x130\n\ _0800C9E0: .4byte gAnimation+0x4E\n\ _0800C9E4: .4byte 0x06013400\n\ -_0800C9E8: .4byte gUnknown_0820816C\n\ +_0800C9E8: .4byte gGfxTalkChoices\n\ _0800C9EC: .4byte 0x040000D4\n\ _0800C9F0: .4byte 0x80000400\n\ _0800C9F4: .4byte 0x0000C038\n\ @@ -1538,10 +1538,10 @@ _0800CA0E:\n\ bl _0800D242\n\ .align 2, 0\n\ _0800CA4C: .4byte 0x040000D4\n\ -_0800CA50: .4byte gUnknown_08190FC0\n\ +_0800CA50: .4byte gGfxInvestigationCheckmark\n\ _0800CA54: .4byte 0x06015400\n\ _0800CA58: .4byte 0x80000100\n\ -_0800CA5C: .4byte gUnknown_081944E0\n\ +_0800CA5C: .4byte gPalInvestigationCheckmark\n\ _0800CA60: .4byte 0x05000360\n\ _0800CA64: .4byte 0x80000010\n\ _0800CA68:\n\ @@ -1713,10 +1713,10 @@ _0800CB60:\n\ b _0800CD42\n\ .align 2, 0\n\ _0800CBA4: .4byte 0x040000D4\n\ -_0800CBA8: .4byte gUnknown_08190FC0\n\ +_0800CBA8: .4byte gGfxInvestigationCheckmark\n\ _0800CBAC: .4byte 0x06015400\n\ _0800CBB0: .4byte 0x80000100\n\ -_0800CBB4: .4byte gUnknown_081944E0\n\ +_0800CBB4: .4byte gPalInvestigationCheckmark\n\ _0800CBB8: .4byte 0x05000360\n\ _0800CBBC: .4byte 0x80000010\n\ _0800CBC0: .4byte gTalkData\n\ @@ -2339,7 +2339,7 @@ _0800D084: .4byte gOamObjects+0x198\n\ _0800D088: .4byte gTalkData\n\ _0800D08C: .4byte gAnimation+0x4E\n\ _0800D090: .4byte 0x06013400\n\ -_0800D094: .4byte gUnknown_0820816C\n\ +_0800D094: .4byte gGfxTalkChoices\n\ _0800D098: .4byte 0x040000D4\n\ _0800D09C: .4byte 0x80000400\n\ _0800D0A0: .4byte 0x0000C038\n\ @@ -2524,7 +2524,7 @@ _0800D1F0: .4byte gTalkData\n\ _0800D1F4: .4byte gOamObjects+0x130\n\ _0800D1F8: .4byte gAnimation+0x4E\n\ _0800D1FC: .4byte 0x06013400\n\ -_0800D200: .4byte gUnknown_0820816C\n\ +_0800D200: .4byte gGfxTalkChoices\n\ _0800D204: .4byte 0x040000D4\n\ _0800D208: .4byte 0x80000400\n\ _0800D20C: .4byte 0x00004018\n\ @@ -2832,7 +2832,7 @@ void LoadLocationChoiceGraphics(void) destination += i*0x800; if(*roomptr != 0xFF) { - src = gUnknown_081FD96C+*roomptr*0x800; + src = gGfxLocationChoices+*roomptr*0x800; DmaCopy16(3, src, destination, 0x800); } roomptr++; @@ -2863,11 +2863,11 @@ void LoadTalkChoiceGraphics(void) destination += i*0x800; if(*icons != 0xFF) { - src = gUnknown_0820816C + *icons*0x800; + src = gGfxTalkChoices + *icons*0x800; DmaCopy16(3, src, destination, 0x800); } icons++; } - DmaCopy16(3, gUnknown_08190FC0, (void *)VRAM+0x15400, 0x200); - DmaCopy16(3, gUnknown_081944E0, (void *)PLTT+0x360, 0x20); + DmaCopy16(3, gGfxInvestigationCheckmark, (void *)VRAM+0x15400, 0x200); + DmaCopy16(3, gPalInvestigationCheckmark, (void *)PLTT+0x360, 0x20); } diff --git a/src/save_processes.c b/src/save_processes.c index 9b5e0a9..4eca34f 100644 --- a/src/save_processes.c +++ b/src/save_processes.c @@ -106,8 +106,8 @@ void ClearSaveProcess(struct Main *main) DmaCopy16(3, gUnusedAsciiCharSet, VRAM + 0x3800, 0x800); DmaCopy16(3, GetBGPalettePtr(0), PLTT, BG_PLTT_SIZE); DmaCopy16(3, gUnknown_08186540, VRAM, 0x1000); - DmaCopy16(3, gUnknown_081964A8, OBJ_VRAM0 + 0x3C00, 0x800); - DmaCopy16(3, gGfxPalChoiceSelected, OBJ_PLTT + 0x120, 0x40); + DmaCopy16(3, gGfxSaveYesOrNo, OBJ_VRAM0 + 0x3C00, 0x800); + DmaCopy16(3, gPalChoiceSelected, OBJ_PLTT + 0x120, 0x40); DmaCopy16(3, gTextPal, OBJ_PLTT, 0x20); gIORegisters.lcd_bg0cnt = BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(28) | BGCNT_16COLOR | BGCNT_WRAP | BGCNT_TXT256x256; gIORegisters.lcd_bg1cnt = BGCNT_PRIORITY(1) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(29) | BGCNT_16COLOR | BGCNT_WRAP | BGCNT_TXT256x256; @@ -257,10 +257,10 @@ void SaveGameInit2(struct Main *main) DmaCopy16(3, &gCourtScroll, &gSaveDataBuffer.courtScroll, sizeof(gCourtScroll)) DmaCopy16(3, gExaminationData, gSaveDataBuffer.examinationData, sizeof(gExaminationData)); DmaCopy16(3, gTalkData, gSaveDataBuffer.talkData, sizeof(gTalkData)); - DmaCopy16(3, gUnknown_08193CA0, OBJ_VRAM0 + 0x3800, 0x400); - DmaCopy16(3, gUnknown_08194580, OBJ_PLTT + 0x100, 0xC0); - DmaCopy16(3, gUnknown_081964A8, OBJ_VRAM0 + 0x3C00, 0x800); - DmaCopy16(3, gGfxPalChoiceSelected, OBJ_PLTT + 0x120, 0x40); + DmaCopy16(3, gGfxNewGameContinue, OBJ_VRAM0 + 0x3800, 0x400); + DmaCopy16(3, gPalNewGameContinue, OBJ_PLTT + 0x100, 0xC0); + DmaCopy16(3, gGfxSaveYesOrNo, OBJ_VRAM0 + 0x3C00, 0x800); + DmaCopy16(3, gPalChoiceSelected, OBJ_PLTT + 0x120, 0x40); DecompressBackgroundIntoBuffer(0x43); CopyBGDataToVram(0x43); main->animationFlags &= ~3; @@ -456,7 +456,7 @@ void SaveGameExitSaveScreen(struct Main *main) RestoreAnimationsFromBuffer(gSaveDataBuffer.backupAnimations); gMain.animationFlags |= 3; DmaCopy16(3, gSaveDataBuffer.oam, gOamObjects, sizeof(gOamObjects)); - DmaCopy16(3, &gUnknown_081942C0[0], OBJ_PLTT+0x100, 0x20); + DmaCopy16(3, &gPalInvestigationExamineCursors[0], OBJ_PLTT+0x100, 0x20); RESTORE_PROCESS_PTR(main); if(main->process[GAME_PROCESS] == INVESTIGATION_PROCESS && main->process[GAME_PROCESS_VAR1] == 3) { diff --git a/src/script_commands2.c b/src/script_commands2.c index fc97ad2..8137213 100644 --- a/src/script_commands2.c +++ b/src/script_commands2.c @@ -38,98 +38,98 @@ struct SpotSelectData static const struct MapMarkerSprite sMapMarkerSprites[] = { { - .tiles = gUnknown_0824698C, + .tiles = gGfxMapMarkersKiller, .size = 0x80, .attr0 = 0x0000, .attr1 = 0x4000, .attr2 = 0x0000, }, { - .tiles = gUnknown_08246A0C, + .tiles = gGfxMapMarkersVictim, .size = 0x80, .attr0 = 0x0000, .attr1 = 0x4000, .attr2 = 0x0000, }, { - .tiles = gUnknown_08246A8C, + .tiles = gGfxMapMarkersCase2MiaBody, .size = 0x400, .attr0 = 0x8038, .attr1 = 0xC086, .attr2 = 0x0000, }, { - .tiles = gUnknown_08246E8C, + .tiles = gGfxMapMarkersCase2Thinker, .size = 0x0040, .attr0 = 0x8050, .attr1 = 0x00A0, .attr2 = 0x0000, }, { - .tiles = gUnknown_08246ECC, + .tiles = gGfxMapMarkersCase3Studio1, .size = 0x800, .attr0 = 0x0008, .attr1 = 0xC000, .attr2 = 0x0000, }, { - .tiles = gUnknown_082476CC, + .tiles = gGfxMapMarkersCase3Studio2, .size = 0x800, .attr0 = 0x0050, .attr1 = 0xC048, .attr2 = 0x0000, }, { - .tiles = gUnknown_08247ECC, + .tiles = gGfxMapMarkersCase3EmployeeArea, .size = 0x800, .attr0 = 0x0028, .attr1 = 0xC0B0, .attr2 = 0x0000, }, { - .tiles = gUnknown_082486CC, + .tiles = gGfxMapMarkersCase3Gate, .size = 0x80, .attr0 = 0x8010, .attr1 = 0x4068, .attr2 = 0x0000, }, { - .tiles = gUnknown_0824874C, + .tiles = gGfxMapMarkersCase3MainGate, .size = 0x100, .attr0 = 0x4000, .attr1 = 0x8090, .attr2 = 0x0000, }, { - .tiles = gUnknown_0824884C, + .tiles = gGfxMapMarkersGreen, .size = 0x80, .attr0 = 0x0010, .attr1 = 0x4098, .attr2 = 0x0000, }, { - .tiles = gUnknown_082488CC, + .tiles = gGfxMapMarkersCase4BoatHorizontal, .size = 0x40, .attr0 = 0x4030, .attr1 = 0x0050, .attr2 = 0x0000, }, { - .tiles = gUnknown_0824890C, + .tiles = gGfxMapMarkersCase4BoatRentalShop, .size = 0x200, .attr0 = 0x0018, .attr1 = 0xC048, .attr2 = 0x0000, }, { - .tiles = gUnknown_08248B0C, + .tiles = gGfxMapMarkersCase4LottaSuv, .size = 0x100, .attr0 = 0x4008, .attr1 = 0x8068, .attr2 = 0x0000, }, { - .tiles = gUnknown_08248C0C, + .tiles = gGfxMapMarkersCase4BoatVertical, .size = 0x40, .attr0 = 0x8030, .attr1 = 0x0050, @@ -850,7 +850,7 @@ bool32 Command39(struct ScriptContext *scriptCtx) mapMarker->id = id; mapMarker->vramPtr = scriptCtx->mapMarkerVramPtr; DmaCopy16(3, sMapMarkerSprites[id].tiles, mapMarker->vramPtr, size = sMapMarkerSprites[id].size); // weird shit going on here - DmaCopy16(3, gUnknown_0824696C, OBJ_PLTT + 0xC0, 0x20); + DmaCopy16(3, gPalMapMarkersPalette, OBJ_PLTT + 0xC0, 0x20); mapMarker->oamIdx = oamIdx; oamObject = &gOamObjects[oamIdx]; @@ -971,8 +971,8 @@ bool32 Command3D(struct ScriptContext *scriptCtx) bool32 Command3E(struct ScriptContext *scriptCtx) { scriptCtx->scriptPtr++; - DmaCopy16(3, gUnknown_08190AC0, OBJ_VRAM0 + 0x1F80, 0x80); - DmaCopy16(3, &gUnknown_081942C0[0], OBJ_PLTT + 0x100, 0x20); + DmaCopy16(3, gGfxInvestigationExamineCursor, OBJ_VRAM0 + 0x1F80, 0x80); + DmaCopy16(3, &gPalInvestigationExamineCursors[0], OBJ_PLTT + 0x100, 0x20); gInvestigation.pointerX = 0xF0; gInvestigation.pointerY = 0x30; gInvestigation.pointerColorCounter = 0; @@ -1055,7 +1055,7 @@ bool32 Command3F(struct ScriptContext *scriptCtx) else ChangeScriptSection(spotselect->defaultSection); scriptCtx->flags |= SCRIPT_SPOTSELECT_SELECTION_MADE; - DmaCopy16(3, &gUnknown_081942C0[0], OBJ_PLTT + 0x100, 0x20); + DmaCopy16(3, &gPalInvestigationExamineCursors[0], OBJ_PLTT + 0x100, 0x20); PlaySE(SE001_MENU_CONFIRM); scriptCtx->flags |= SCRIPT_SPOTSELECT_SELECTION_MADE; gOamObjects[88].attr0 = SPRITE_ATTR0(investigation->pointerY, ST_OAM_AFFINE_OFF, ST_OAM_OBJ_NORMAL, FALSE, ST_OAM_4BPP, ST_OAM_SQUARE); @@ -1069,7 +1069,7 @@ bool32 Command3F(struct ScriptContext *scriptCtx) investigation->pointerColorCounter = 0; investigation->pointerColor++; investigation->pointerColor &= 0xF; - DmaCopy16(3, &gUnknown_081942C0[investigation->pointerColor * 0x20], OBJ_PLTT + 0x100, 0x20); + DmaCopy16(3, &gPalInvestigationExamineCursors[investigation->pointerColor * 0x20], OBJ_PLTT + 0x100, 0x20); } } scriptCtx->flags |= SCRIPT_SPOTSELECT_SELECTION_MADE; diff --git a/src/script_commands3.c b/src/script_commands3.c index c49d158..cdb96b0 100644 --- a/src/script_commands3.c +++ b/src/script_commands3.c @@ -93,15 +93,15 @@ bool32 Command44(struct ScriptContext * scriptCtx) BACKUP_PROCESS(); if(*scriptCtx->scriptPtr) { - DmaCopy16(3, gUnknown_08191CA0, OBJ_VRAM0+0x3400, 0x1000); - DmaCopy16(3, gUnknown_08194520, OBJ_PLTT+0xA0, 0x20); + DmaCopy16(3, gGfxTrialGuilty1, OBJ_VRAM0+0x3400, 0x1000); + DmaCopy16(3, gPalTrialGuilty, OBJ_PLTT+0xA0, 0x20); SET_PROCESS(VERDICT_PROCESS,0,0,0); } else { - DmaCopy16(3, gUnknown_081914A0, OBJ_VRAM0+0x3400, 0x800); - DmaCopy16(3, gUnknown_081924A0, OBJ_VRAM0+0x3C00, 0x800); - DmaCopy16(3, gUnknown_08194540, OBJ_PLTT+0xA0, 0x20); + DmaCopy16(3, gGfxTrialNotGuilty1, OBJ_VRAM0+0x3400, 0x800); + DmaCopy16(3, gGfxTrialGuiltyNotGuilty2, OBJ_VRAM0+0x3C00, 0x800); + DmaCopy16(3, gPalTrialNotGuilty, OBJ_PLTT+0xA0, 0x20); SET_PROCESS(VERDICT_PROCESS,0,0,1); } scriptCtx->scriptPtr++; @@ -122,14 +122,14 @@ bool32 Command46(struct ScriptContext * scriptCtx) if(*scriptCtx->scriptPtr) { gMain.horizontolBGScrollSpeed = -0xE; - r6 = gGfx_BG065; - r3 = (u16 *)gUnknown_08362544; + r6 = gPal_BG065_BustupEdgeworth; + r3 = (u16 *)gMap_BG065_BustupEdgeworth; } else { gMain.horizontolBGScrollSpeed = 0xE; - r6 = gGfx_BG064; - r3 = (u16 *)gUnknown_08360854; + r6 = gPal_BG064_BustupPhoenix; + r3 = (u16 *)gMap_BG064_BustupPhoenix; } for(i = 0; i < 20; i++) { diff --git a/src/title_processes.c b/src/title_processes.c index 219d53b..20c93c7 100644 --- a/src/title_processes.c +++ b/src/title_processes.c @@ -66,11 +66,11 @@ void TitleScreenProcess(struct Main *main) break; case 1: DmaCopy16(3, gUnusedAsciiCharSet, VRAM + 0x3800, 0x800); - DmaCopy16(3, gGfxPalTitleScreen, PLTT, 0x200); + DmaCopy16(3, gPalTitleScreen, PLTT, 0x200); LZ77UnCompWram(gGfx8lzTitleScreen, eBGDecompBuffer); DmaCopy16(3, eBGDecompBuffer, BG_CHAR_ADDR(1), 30*20*TILE_SIZE_8BPP); - DmaCopy16(3, gUnknown_08194580, OBJ_PLTT + 0x40, 0xC0); - DmaCopy16(3, gUnknown_08193CA0, OBJ_VRAM0 + 0x400, 0x400); + DmaCopy16(3, gPalNewGameContinue, OBJ_PLTT + 0x40, 0xC0); + DmaCopy16(3, gGfxNewGameContinue, OBJ_VRAM0 + 0x400, 0x400); oam = &gOamObjects[49]; oam->attr0 = SPRITE_ATTR0(112, ST_OAM_AFFINE_OFF, ST_OAM_OBJ_NORMAL, FALSE, ST_OAM_4BPP, ST_OAM_H_RECTANGLE); oam->attr1 = SPRITE_ATTR1_NONAFFINE(88, FALSE, FALSE, 2); From ac170baeff4d4c9ed816cd98e323f77f031c9b4c Mon Sep 17 00:00:00 2001 From: Missingmew Date: Fri, 1 Sep 2023 22:33:53 +0200 Subject: [PATCH 06/17] autoname evidence profile descriptions --- data/graphics.s | 648 +++++++++--------- .../{001AFE0C.png => evidence/air_tube.png} | Bin .../article_gourdy.png} | Bin .../{001AED3C.png => evidence/bullet_0.png} | Bin .../{001AF15C.png => evidence/bullet_1.png} | Bin .../cindy_stones_passport.png} | Bin .../codys_digital_camera.png} | Bin .../codys_steel_samurai_scrapbook.png} | Bin .../dl-6_bullet.png} | Bin .../empty_bottle_0.png} | Bin .../empty_bottle_1.png} | Bin .../empty_plate.png} | Bin .../firecrackers.png} | Bin .../fishing_pole.png} | Bin .../generic_affidavit_0.png} | Bin .../generic_affidavit_1.png} | Bin .../generic_affidavit_2.png} | Bin .../generic_affidavit_3.png} | Bin .../generic_affidavit_4.png} | Bin .../generic_affidavit_5.png} | Bin .../generic_autopsy_report_0.png} | Bin .../generic_autopsy_report_1.png} | Bin .../generic_autopsy_report_2.png} | Bin .../generic_autopsy_report_3.png} | Bin .../generic_autopsy_report_4.png} | Bin .../generic_autopsy_report_5.png} | Bin .../generic_autopsy_report_6.png} | Bin .../generic_autopsy_report_7.png} | Bin .../generic_letter_0.png} | Bin .../generic_letter_1.png} | Bin .../generic_letter_2.png} | Bin .../generic_letter_3.png} | Bin .../generic_newspaper_clipping.png} | Bin .../generic_photo_0.png} | Bin .../generic_photo_1.png} | Bin .../generic_photo_2.png} | Bin .../generic_photo_3.png} | Bin .../generic_photo_4.png} | Bin .../generic_photo_5.png} | Bin .../generic_photo_6.png} | Bin .../generic_photo_7.png} | Bin .../generic_photo_8.png} | Bin .../generic_photo_9.png} | Bin .../glass_shards.png} | Bin .../global_studios_card_key.png} | Bin .../global_studios_van.png} | Bin .../key_to_cottage.png} | Bin .../lottas_camera_0.png} | Bin .../lottas_camera_1.png} | Bin .../{0019E9D8.png => evidence/maya_memo.png} | Bin .../mayas_cellphone.png} | Bin .../metal_detector.png} | Bin .../{001B01D0.png => evidence/missile.png} | Bin .../missile_angry.png} | Bin .../{001A675C.png => evidence/mr_monkey.png} | Bin .../note_from_the_safe.png} | Bin .../phoenix_badge.png} | Bin .../{001AF5A8.png => evidence/pistol.png} | Bin .../plate_with_steak_bones.png} | Bin .../{001B0DC4.png => evidence/polly.png} | Bin .../steel_samurai_cards.png} | Bin .../steel_samurai_script.png} | Bin .../steel_samurai_spear_0.png} | Bin .../steel_samurai_spear_1.png} | Bin .../steel_samurai_ultra_rare_card.png} | Bin .../the_thinker_0.png} | Bin .../the_thinker_1.png} | Bin .../the_thinker_2.png} | Bin .../{0019F208.png => evidence/wiretap.png} | Bin .../yannis_safe.png} | Bin .../april_may_0.png} | Bin .../april_may_1.png} | Bin .../april_may_2.png} | Bin .../{0019C0D8.png => profiles/bellboy_0.png} | Bin .../{0019C434.png => profiles/bellboy_1.png} | Bin .../cindy_stone.png} | Bin .../cody_hackins.png} | Bin .../dee_vasquez.png} | Bin .../dick_gumshoe.png} | Bin .../frank_sahwit.png} | Bin .../gregory_edgeworth.png} | Bin .../jack_hammer.png} | Bin .../larry_butz_0.png} | Bin .../larry_butz_1.png} | Bin .../lotta_hart_0.png} | Bin .../lotta_hart_1.png} | Bin .../manfred_von_karma.png} | Bin .../marvin_grossberg.png} | Bin .../{001970DC.png => profiles/maya_fey_0.png} | Bin .../{00199AEC.png => profiles/maya_fey_1.png} | Bin .../{00199EC8.png => profiles/maya_fey_2.png} | Bin .../{0019A2E4.png => profiles/maya_fey_3.png} | Bin .../{00196CA8.png => profiles/mia_fey_0.png} | Bin .../{00199690.png => profiles/mia_fey_1.png} | Bin .../miles_edgeworth_0.png} | Bin .../miles_edgeworth_1.png} | Bin .../misty_fey_0.png} | Bin .../misty_fey_1.png} | Bin .../misty_fey_2.png} | Bin .../{001AB178.png => profiles/old_man_0.png} | Bin .../{001AB574.png => profiles/old_man_1.png} | Bin .../penny_nichols.png} | Bin .../redd_white_0.png} | Bin .../redd_white_1.png} | Bin .../robert_hammond.png} | Bin .../sal_manella.png} | Bin .../wendy_oldbag.png} | Bin .../will_powers.png} | Bin .../winston_payne.png} | Bin include/graphics.h | 432 ++++++------ src/court_record.c | 216 +++--- 111 files changed, 648 insertions(+), 648 deletions(-) rename graphics/evidence_profile_descriptions/{001AFE0C.png => evidence/air_tube.png} (100%) rename graphics/evidence_profile_descriptions/{001AE0DC.png => evidence/article_gourdy.png} (100%) rename graphics/evidence_profile_descriptions/{001AED3C.png => evidence/bullet_0.png} (100%) rename graphics/evidence_profile_descriptions/{001AF15C.png => evidence/bullet_1.png} (100%) rename graphics/evidence_profile_descriptions/{00198E5C.png => evidence/cindy_stones_passport.png} (100%) rename graphics/evidence_profile_descriptions/{001A775C.png => evidence/codys_digital_camera.png} (100%) rename graphics/evidence_profile_descriptions/{001A7310.png => evidence/codys_steel_samurai_scrapbook.png} (100%) rename graphics/evidence_profile_descriptions/{001B2150.png => evidence/dl-6_bullet.png} (100%) rename graphics/evidence_profile_descriptions/{001A5828.png => evidence/empty_bottle_0.png} (100%) rename graphics/evidence_profile_descriptions/{001A7FA4.png => evidence/empty_bottle_1.png} (100%) rename graphics/evidence_profile_descriptions/{001A8C30.png => evidence/empty_plate.png} (100%) rename graphics/evidence_profile_descriptions/{001AB9FC.png => evidence/firecrackers.png} (100%) rename graphics/evidence_profile_descriptions/{001B0594.png => evidence/fishing_pole.png} (100%) rename graphics/evidence_profile_descriptions/{00199228.png => evidence/generic_affidavit_0.png} (100%) rename graphics/evidence_profile_descriptions/{0019F5C0.png => evidence/generic_affidavit_1.png} (100%) rename graphics/evidence_profile_descriptions/{001A09E4.png => evidence/generic_affidavit_2.png} (100%) rename graphics/evidence_profile_descriptions/{001A3714.png => evidence/generic_affidavit_3.png} (100%) rename graphics/evidence_profile_descriptions/{001AE4FC.png => evidence/generic_affidavit_4.png} (100%) rename graphics/evidence_profile_descriptions/{001AF9DC.png => evidence/generic_affidavit_5.png} (100%) rename graphics/evidence_profile_descriptions/{001985D8.png => evidence/generic_autopsy_report_0.png} (100%) rename graphics/evidence_profile_descriptions/{0019D028.png => evidence/generic_autopsy_report_1.png} (100%) rename graphics/evidence_profile_descriptions/{001A0E58.png => evidence/generic_autopsy_report_2.png} (100%) rename graphics/evidence_profile_descriptions/{001A3B44.png => evidence/generic_autopsy_report_3.png} (100%) rename graphics/evidence_profile_descriptions/{001ABE00.png => evidence/generic_autopsy_report_4.png} (100%) rename graphics/evidence_profile_descriptions/{001AC2B0.png => evidence/generic_autopsy_report_5.png} (100%) rename graphics/evidence_profile_descriptions/{001AC75C.png => evidence/generic_autopsy_report_6.png} (100%) rename graphics/evidence_profile_descriptions/{001B14EC.png => evidence/generic_autopsy_report_7.png} (100%) rename graphics/evidence_profile_descriptions/{0019D4C8.png => evidence/generic_letter_0.png} (100%) rename graphics/evidence_profile_descriptions/{001A1324.png => evidence/generic_letter_1.png} (100%) rename graphics/evidence_profile_descriptions/{001A5FA4.png => evidence/generic_letter_2.png} (100%) rename graphics/evidence_profile_descriptions/{001B1CBC.png => evidence/generic_letter_3.png} (100%) rename graphics/evidence_profile_descriptions/{001A0120.png => evidence/generic_newspaper_clipping.png} (100%) rename graphics/evidence_profile_descriptions/{001A0580.png => evidence/generic_photo_0.png} (100%) rename graphics/evidence_profile_descriptions/{001A439C.png => evidence/generic_photo_1.png} (100%) rename graphics/evidence_profile_descriptions/{001A47D4.png => evidence/generic_photo_2.png} (100%) rename graphics/evidence_profile_descriptions/{001A4BD4.png => evidence/generic_photo_3.png} (100%) rename graphics/evidence_profile_descriptions/{001A83C4.png => evidence/generic_photo_4.png} (100%) rename graphics/evidence_profile_descriptions/{001AD02C.png => evidence/generic_photo_5.png} (100%) rename graphics/evidence_profile_descriptions/{001AD448.png => evidence/generic_photo_6.png} (100%) rename graphics/evidence_profile_descriptions/{001AD864.png => evidence/generic_photo_7.png} (100%) rename graphics/evidence_profile_descriptions/{001AE938.png => evidence/generic_photo_8.png} (100%) rename graphics/evidence_profile_descriptions/{001B18C0.png => evidence/generic_photo_9.png} (100%) rename graphics/evidence_profile_descriptions/{0019DDAC.png => evidence/glass_shards.png} (100%) rename graphics/evidence_profile_descriptions/{001A3FF8.png => evidence/global_studios_card_key.png} (100%) rename graphics/evidence_profile_descriptions/{001A8828.png => evidence/global_studios_van.png} (100%) rename graphics/evidence_profile_descriptions/{001A5BF4.png => evidence/key_to_cottage.png} (100%) rename graphics/evidence_profile_descriptions/{001A1728.png => evidence/lottas_camera_0.png} (100%) rename graphics/evidence_profile_descriptions/{001ACBFC.png => evidence/lottas_camera_1.png} (100%) rename graphics/evidence_profile_descriptions/{0019E9D8.png => evidence/maya_memo.png} (100%) rename graphics/evidence_profile_descriptions/{0019D90C.png => evidence/mayas_cellphone.png} (100%) rename graphics/evidence_profile_descriptions/{001B0984.png => evidence/metal_detector.png} (100%) rename graphics/evidence_profile_descriptions/{001B01D0.png => evidence/missile.png} (100%) rename graphics/evidence_profile_descriptions/{001B25F0.png => evidence/missile_angry.png} (100%) rename graphics/evidence_profile_descriptions/{001A675C.png => evidence/mr_monkey.png} (100%) rename graphics/evidence_profile_descriptions/{0019EDF0.png => evidence/note_from_the_safe.png} (100%) rename graphics/evidence_profile_descriptions/{0019CC44.png => evidence/phoenix_badge.png} (100%) rename graphics/evidence_profile_descriptions/{001AF5A8.png => evidence/pistol.png} (100%) rename graphics/evidence_profile_descriptions/{001A7B68.png => evidence/plate_with_steak_bones.png} (100%) rename graphics/evidence_profile_descriptions/{001B0DC4.png => evidence/polly.png} (100%) rename graphics/evidence_profile_descriptions/{001A6B88.png => evidence/steel_samurai_cards.png} (100%) rename graphics/evidence_profile_descriptions/{001A639C.png => evidence/steel_samurai_script.png} (100%) rename graphics/evidence_profile_descriptions/{001A4FF0.png => evidence/steel_samurai_spear_0.png} (100%) rename graphics/evidence_profile_descriptions/{001A541C.png => evidence/steel_samurai_spear_1.png} (100%) rename graphics/evidence_profile_descriptions/{001A6F68.png => evidence/steel_samurai_ultra_rare_card.png} (100%) rename graphics/evidence_profile_descriptions/{00198A84.png => evidence/the_thinker_0.png} (100%) rename graphics/evidence_profile_descriptions/{0019E18C.png => evidence/the_thinker_1.png} (100%) rename graphics/evidence_profile_descriptions/{0019E5A0.png => evidence/the_thinker_2.png} (100%) rename graphics/evidence_profile_descriptions/{0019F208.png => evidence/wiretap.png} (100%) rename graphics/evidence_profile_descriptions/{001B1150.png => evidence/yannis_safe.png} (100%) rename graphics/evidence_profile_descriptions/{0019B028.png => profiles/april_may_0.png} (100%) rename graphics/evidence_profile_descriptions/{0019B428.png => profiles/april_may_1.png} (100%) rename graphics/evidence_profile_descriptions/{0019B868.png => profiles/april_may_2.png} (100%) rename graphics/evidence_profile_descriptions/{0019C0D8.png => profiles/bellboy_0.png} (100%) rename graphics/evidence_profile_descriptions/{0019C434.png => profiles/bellboy_1.png} (100%) rename graphics/evidence_profile_descriptions/{00197928.png => profiles/cindy_stone.png} (100%) rename graphics/evidence_profile_descriptions/{001A3330.png => profiles/cody_hackins.png} (100%) rename graphics/evidence_profile_descriptions/{001A2EE4.png => profiles/dee_vasquez.png} (100%) rename graphics/evidence_profile_descriptions/{0019ABBC.png => profiles/dick_gumshoe.png} (100%) rename graphics/evidence_profile_descriptions/{00197D18.png => profiles/frank_sahwit.png} (100%) rename graphics/evidence_profile_descriptions/{001AACDC.png => profiles/gregory_edgeworth.png} (100%) rename graphics/evidence_profile_descriptions/{001A22A4.png => profiles/jack_hammer.png} (100%) rename graphics/evidence_profile_descriptions/{00197514.png => profiles/larry_butz_0.png} (100%) rename graphics/evidence_profile_descriptions/{001A9BC8.png => profiles/larry_butz_1.png} (100%) rename graphics/evidence_profile_descriptions/{001A9380.png => profiles/lotta_hart_0.png} (100%) rename graphics/evidence_profile_descriptions/{001A97CC.png => profiles/lotta_hart_1.png} (100%) rename graphics/evidence_profile_descriptions/{001AA894.png => profiles/manfred_von_karma.png} (100%) rename graphics/evidence_profile_descriptions/{0019C810.png => profiles/marvin_grossberg.png} (100%) rename graphics/evidence_profile_descriptions/{001970DC.png => profiles/maya_fey_0.png} (100%) rename graphics/evidence_profile_descriptions/{00199AEC.png => profiles/maya_fey_1.png} (100%) rename graphics/evidence_profile_descriptions/{00199EC8.png => profiles/maya_fey_2.png} (100%) rename graphics/evidence_profile_descriptions/{0019A2E4.png => profiles/maya_fey_3.png} (100%) rename graphics/evidence_profile_descriptions/{00196CA8.png => profiles/mia_fey_0.png} (100%) rename graphics/evidence_profile_descriptions/{00199690.png => profiles/mia_fey_1.png} (100%) rename graphics/evidence_profile_descriptions/{0019A700.png => profiles/miles_edgeworth_0.png} (100%) rename graphics/evidence_profile_descriptions/{001A8F4C.png => profiles/miles_edgeworth_1.png} (100%) rename graphics/evidence_profile_descriptions/{0019F9E8.png => profiles/misty_fey_0.png} (100%) rename graphics/evidence_profile_descriptions/{001AA458.png => profiles/misty_fey_1.png} (100%) rename graphics/evidence_profile_descriptions/{001ADCD4.png => profiles/misty_fey_2.png} (100%) rename graphics/evidence_profile_descriptions/{001AB178.png => profiles/old_man_0.png} (100%) rename graphics/evidence_profile_descriptions/{001AB574.png => profiles/old_man_1.png} (100%) rename graphics/evidence_profile_descriptions/{001A26BC.png => profiles/penny_nichols.png} (100%) rename graphics/evidence_profile_descriptions/{0019BCE4.png => profiles/redd_white_0.png} (100%) rename graphics/evidence_profile_descriptions/{0019FD84.png => profiles/redd_white_1.png} (100%) rename graphics/evidence_profile_descriptions/{001AA054.png => profiles/robert_hammond.png} (100%) rename graphics/evidence_profile_descriptions/{001A2AE4.png => profiles/sal_manella.png} (100%) rename graphics/evidence_profile_descriptions/{001A1E1C.png => profiles/wendy_oldbag.png} (100%) rename graphics/evidence_profile_descriptions/{001A1A10.png => profiles/will_powers.png} (100%) rename graphics/evidence_profile_descriptions/{001981A0.png => profiles/winston_payne.png} (100%) diff --git a/data/graphics.s b/data/graphics.s index a77e581..fa6f24c 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -210,437 +210,437 @@ gGfxSaveYesOrNo: @ BEGIN PROFILE AND EVIDENCE DESCRIPTIONS - .global gUnknown_08196CA8 -gUnknown_08196CA8: - .incbin "graphics/evidence_profile_descriptions/00196CA8.4bpp.lz" + .global gGfxProfilesMiaFey0_description +gGfxProfilesMiaFey0_description: + .incbin "graphics/evidence_profile_descriptions/profiles/mia_fey_0.4bpp.lz" - .global gUnknown_081970DC -gUnknown_081970DC: - .incbin "graphics/evidence_profile_descriptions/001970DC.4bpp.lz" + .global gGfxProfilesMayaFey0_description +gGfxProfilesMayaFey0_description: + .incbin "graphics/evidence_profile_descriptions/profiles/maya_fey_0.4bpp.lz" - .global gUnknown_08197514 -gUnknown_08197514: - .incbin "graphics/evidence_profile_descriptions/00197514.4bpp.lz" + .global gGfxProfilesLarryButz0_description +gGfxProfilesLarryButz0_description: + .incbin "graphics/evidence_profile_descriptions/profiles/larry_butz_0.4bpp.lz" - .global gUnknown_08197928 -gUnknown_08197928: - .incbin "graphics/evidence_profile_descriptions/00197928.4bpp.lz" + .global gGfxProfilesCindyStone_description +gGfxProfilesCindyStone_description: + .incbin "graphics/evidence_profile_descriptions/profiles/cindy_stone.4bpp.lz" - .global gUnknown_08197D18 -gUnknown_08197D18: - .incbin "graphics/evidence_profile_descriptions/00197D18.4bpp.lz" + .global gGfxProfilesFrankSahwit_description +gGfxProfilesFrankSahwit_description: + .incbin "graphics/evidence_profile_descriptions/profiles/frank_sahwit.4bpp.lz" - .global gUnknown_081981A0 -gUnknown_081981A0: - .incbin "graphics/evidence_profile_descriptions/001981A0.4bpp.lz" + .global gGfxProfilesWinstonPayne_description +gGfxProfilesWinstonPayne_description: + .incbin "graphics/evidence_profile_descriptions/profiles/winston_payne.4bpp.lz" - .global gUnknown_081985D8 -gUnknown_081985D8: - .incbin "graphics/evidence_profile_descriptions/001985D8.4bpp.lz" + .global gGfxEvidenceGenericAutopsyReport0_description +gGfxEvidenceGenericAutopsyReport0_description: + .incbin "graphics/evidence_profile_descriptions/evidence/generic_autopsy_report_0.4bpp.lz" - .global gUnknown_08198A84 -gUnknown_08198A84: - .incbin "graphics/evidence_profile_descriptions/00198A84.4bpp.lz" + .global gGfxEvidenceTheThinker0_description +gGfxEvidenceTheThinker0_description: + .incbin "graphics/evidence_profile_descriptions/evidence/the_thinker_0.4bpp.lz" - .global gUnknown_08198E5C -gUnknown_08198E5C: - .incbin "graphics/evidence_profile_descriptions/00198E5C.4bpp.lz" + .global gGfxEvidenceCindyStonesPassport_description +gGfxEvidenceCindyStonesPassport_description: + .incbin "graphics/evidence_profile_descriptions/evidence/cindy_stones_passport.4bpp.lz" - .global gUnknown_08199228 -gUnknown_08199228: - .incbin "graphics/evidence_profile_descriptions/00199228.4bpp.lz" + .global gGfxEvidenceGenericAffidavit0_description +gGfxEvidenceGenericAffidavit0_description: + .incbin "graphics/evidence_profile_descriptions/evidence/generic_affidavit_0.4bpp.lz" - .global gUnknown_08199690 -gUnknown_08199690: - .incbin "graphics/evidence_profile_descriptions/00199690.4bpp.lz" + .global gGfxProfilesMiaFey1_description +gGfxProfilesMiaFey1_description: + .incbin "graphics/evidence_profile_descriptions/profiles/mia_fey_1.4bpp.lz" - .global gUnknown_08199AEC -gUnknown_08199AEC: - .incbin "graphics/evidence_profile_descriptions/00199AEC.4bpp.lz" + .global gGfxProfilesMayaFey1_description +gGfxProfilesMayaFey1_description: + .incbin "graphics/evidence_profile_descriptions/profiles/maya_fey_1.4bpp.lz" - .global gUnknown_08199EC8 -gUnknown_08199EC8: - .incbin "graphics/evidence_profile_descriptions/00199EC8.4bpp.lz" + .global gGfxProfilesMayaFey2_description +gGfxProfilesMayaFey2_description: + .incbin "graphics/evidence_profile_descriptions/profiles/maya_fey_2.4bpp.lz" - .global gUnknown_0819A2E4 -gUnknown_0819A2E4: - .incbin "graphics/evidence_profile_descriptions/0019A2E4.4bpp.lz" + .global gGfxProfilesMayaFey3_description +gGfxProfilesMayaFey3_description: + .incbin "graphics/evidence_profile_descriptions/profiles/maya_fey_3.4bpp.lz" - .global gUnknown_0819A700 -gUnknown_0819A700: - .incbin "graphics/evidence_profile_descriptions/0019A700.4bpp.lz" + .global gGfxProfilesMilesEdgeworth0_description +gGfxProfilesMilesEdgeworth0_description: + .incbin "graphics/evidence_profile_descriptions/profiles/miles_edgeworth_0.4bpp.lz" - .global gUnknown_0819ABBC -gUnknown_0819ABBC: - .incbin "graphics/evidence_profile_descriptions/0019ABBC.4bpp.lz" + .global gGfxProfilesDickGumshoe_description +gGfxProfilesDickGumshoe_description: + .incbin "graphics/evidence_profile_descriptions/profiles/dick_gumshoe.4bpp.lz" - .global gUnknown_0819B028 -gUnknown_0819B028: - .incbin "graphics/evidence_profile_descriptions/0019B028.4bpp.lz" + .global gGfxProfilesAprilMay0_description +gGfxProfilesAprilMay0_description: + .incbin "graphics/evidence_profile_descriptions/profiles/april_may_0.4bpp.lz" - .global gUnknown_0819B428 -gUnknown_0819B428: - .incbin "graphics/evidence_profile_descriptions/0019B428.4bpp.lz" + .global gGfxProfilesAprilMay1_description +gGfxProfilesAprilMay1_description: + .incbin "graphics/evidence_profile_descriptions/profiles/april_may_1.4bpp.lz" - .global gUnknown_0819B868 -gUnknown_0819B868: - .incbin "graphics/evidence_profile_descriptions/0019B868.4bpp.lz" + .global gGfxProfilesAprilMay2_description +gGfxProfilesAprilMay2_description: + .incbin "graphics/evidence_profile_descriptions/profiles/april_may_2.4bpp.lz" - .global gUnknown_0819BCE4 -gUnknown_0819BCE4: - .incbin "graphics/evidence_profile_descriptions/0019BCE4.4bpp.lz" + .global gGfxProfilesReddWhite0_description +gGfxProfilesReddWhite0_description: + .incbin "graphics/evidence_profile_descriptions/profiles/redd_white_0.4bpp.lz" - .global gUnknown_0819C0D8 -gUnknown_0819C0D8: - .incbin "graphics/evidence_profile_descriptions/0019C0D8.4bpp.lz" + .global gGfxProfilesBellboy0_description +gGfxProfilesBellboy0_description: + .incbin "graphics/evidence_profile_descriptions/profiles/bellboy_0.4bpp.lz" - .global gUnknown_0819C434 -gUnknown_0819C434: - .incbin "graphics/evidence_profile_descriptions/0019C434.4bpp.lz" + .global gGfxProfilesBellboy1_description +gGfxProfilesBellboy1_description: + .incbin "graphics/evidence_profile_descriptions/profiles/bellboy_1.4bpp.lz" - .global gUnknown_0819C810 -gUnknown_0819C810: - .incbin "graphics/evidence_profile_descriptions/0019C810.4bpp.lz" + .global gGfxProfilesMarvinGrossberg_description +gGfxProfilesMarvinGrossberg_description: + .incbin "graphics/evidence_profile_descriptions/profiles/marvin_grossberg.4bpp.lz" - .global gUnknown_0819CC44 -gUnknown_0819CC44: - .incbin "graphics/evidence_profile_descriptions/0019CC44.4bpp.lz" + .global gGfxEvidencePhoenixBadge_description +gGfxEvidencePhoenixBadge_description: + .incbin "graphics/evidence_profile_descriptions/evidence/phoenix_badge.4bpp.lz" - .global gUnknown_0819D028 -gUnknown_0819D028: - .incbin "graphics/evidence_profile_descriptions/0019D028.4bpp.lz" + .global gGfxEvidenceGenericAutopsyReport1_description +gGfxEvidenceGenericAutopsyReport1_description: + .incbin "graphics/evidence_profile_descriptions/evidence/generic_autopsy_report_1.4bpp.lz" - .global gUnknown_0819D4C8 -gUnknown_0819D4C8: - .incbin "graphics/evidence_profile_descriptions/0019D4C8.4bpp.lz" + .global gGfxEvidenceGenericLetter0_description +gGfxEvidenceGenericLetter0_description: + .incbin "graphics/evidence_profile_descriptions/evidence/generic_letter_0.4bpp.lz" - .global gUnknown_0819D90C -gUnknown_0819D90C: - .incbin "graphics/evidence_profile_descriptions/0019D90C.4bpp.lz" + .global gGfxEvidenceMayasCellphone_description +gGfxEvidenceMayasCellphone_description: + .incbin "graphics/evidence_profile_descriptions/evidence/mayas_cellphone.4bpp.lz" - .global gUnknown_0819DDAC -gUnknown_0819DDAC: - .incbin "graphics/evidence_profile_descriptions/0019DDAC.4bpp.lz" + .global gGfxEvidenceGlassShards_description +gGfxEvidenceGlassShards_description: + .incbin "graphics/evidence_profile_descriptions/evidence/glass_shards.4bpp.lz" - .global gUnknown_0819E18C -gUnknown_0819E18C: - .incbin "graphics/evidence_profile_descriptions/0019E18C.4bpp.lz" + .global gGfxEvidenceTheThinker1_description +gGfxEvidenceTheThinker1_description: + .incbin "graphics/evidence_profile_descriptions/evidence/the_thinker_1.4bpp.lz" - .global gUnknown_0819E5A0 -gUnknown_0819E5A0: - .incbin "graphics/evidence_profile_descriptions/0019E5A0.4bpp.lz" + .global gGfxEvidenceTheThinker2_description +gGfxEvidenceTheThinker2_description: + .incbin "graphics/evidence_profile_descriptions/evidence/the_thinker_2.4bpp.lz" - .global gUnknown_0819E9D8 -gUnknown_0819E9D8: - .incbin "graphics/evidence_profile_descriptions/0019E9D8.4bpp.lz" + .global gGfxEvidenceMayaMemo_description +gGfxEvidenceMayaMemo_description: + .incbin "graphics/evidence_profile_descriptions/evidence/maya_memo.4bpp.lz" - .global gUnknown_0819EDF0 -gUnknown_0819EDF0: - .incbin "graphics/evidence_profile_descriptions/0019EDF0.4bpp.lz" + .global gGfxEvidenceNoteFromTheSafe_description +gGfxEvidenceNoteFromTheSafe_description: + .incbin "graphics/evidence_profile_descriptions/evidence/note_from_the_safe.4bpp.lz" - .global gUnknown_0819F208 -gUnknown_0819F208: - .incbin "graphics/evidence_profile_descriptions/0019F208.4bpp.lz" + .global gGfxEvidenceWiretap_description +gGfxEvidenceWiretap_description: + .incbin "graphics/evidence_profile_descriptions/evidence/wiretap.4bpp.lz" - .global gUnknown_0819F5C0 -gUnknown_0819F5C0: - .incbin "graphics/evidence_profile_descriptions/0019F5C0.4bpp.lz" + .global gGfxEvidenceGenericAffidavit1_description +gGfxEvidenceGenericAffidavit1_description: + .incbin "graphics/evidence_profile_descriptions/evidence/generic_affidavit_1.4bpp.lz" - .global gUnknown_0819F9E8 -gUnknown_0819F9E8: - .incbin "graphics/evidence_profile_descriptions/0019F9E8.4bpp.lz" + .global gGfxProfilesMistyFey0_description +gGfxProfilesMistyFey0_description: + .incbin "graphics/evidence_profile_descriptions/profiles/misty_fey_0.4bpp.lz" - .global gUnknown_0819FD84 -gUnknown_0819FD84: - .incbin "graphics/evidence_profile_descriptions/0019FD84.4bpp.lz" + .global gGfxProfilesReddWhite1_description +gGfxProfilesReddWhite1_description: + .incbin "graphics/evidence_profile_descriptions/profiles/redd_white_1.4bpp.lz" - .global gUnknown_081A0120 -gUnknown_081A0120: - .incbin "graphics/evidence_profile_descriptions/001A0120.4bpp.lz" + .global gGfxEvidenceGenericNewspaperClipping_description +gGfxEvidenceGenericNewspaperClipping_description: + .incbin "graphics/evidence_profile_descriptions/evidence/generic_newspaper_clipping.4bpp.lz" - .global gUnknown_081A0580 -gUnknown_081A0580: - .incbin "graphics/evidence_profile_descriptions/001A0580.4bpp.lz" + .global gGfxEvidenceGenericPhoto0_description +gGfxEvidenceGenericPhoto0_description: + .incbin "graphics/evidence_profile_descriptions/evidence/generic_photo_0.4bpp.lz" - .global gUnknown_081A09E4 -gUnknown_081A09E4: - .incbin "graphics/evidence_profile_descriptions/001A09E4.4bpp.lz" + .global gGfxEvidenceGenericAffidavit2_description +gGfxEvidenceGenericAffidavit2_description: + .incbin "graphics/evidence_profile_descriptions/evidence/generic_affidavit_2.4bpp.lz" - .global gUnknown_081A0E58 -gUnknown_081A0E58: - .incbin "graphics/evidence_profile_descriptions/001A0E58.4bpp.lz" + .global gGfxEvidenceGenericAutopsyReport2_description +gGfxEvidenceGenericAutopsyReport2_description: + .incbin "graphics/evidence_profile_descriptions/evidence/generic_autopsy_report_2.4bpp.lz" - .global gUnknown_081A1324 -gUnknown_081A1324: - .incbin "graphics/evidence_profile_descriptions/001A1324.4bpp.lz" + .global gGfxEvidenceGenericLetter1_description +gGfxEvidenceGenericLetter1_description: + .incbin "graphics/evidence_profile_descriptions/evidence/generic_letter_1.4bpp.lz" - .global gUnknown_081A1728 -gUnknown_081A1728: - .incbin "graphics/evidence_profile_descriptions/001A1728.4bpp.lz" + .global gGfxEvidenceLottasCamera0_description +gGfxEvidenceLottasCamera0_description: + .incbin "graphics/evidence_profile_descriptions/evidence/lottas_camera_0.4bpp.lz" - .global gUnknown_081A1A10 -gUnknown_081A1A10: - .incbin "graphics/evidence_profile_descriptions/001A1A10.4bpp.lz" + .global gGfxProfilesWillPowers_description +gGfxProfilesWillPowers_description: + .incbin "graphics/evidence_profile_descriptions/profiles/will_powers.4bpp.lz" - .global gUnknown_081A1E1C -gUnknown_081A1E1C: - .incbin "graphics/evidence_profile_descriptions/001A1E1C.4bpp.lz" + .global gGfxProfilesWendyOldbag_description +gGfxProfilesWendyOldbag_description: + .incbin "graphics/evidence_profile_descriptions/profiles/wendy_oldbag.4bpp.lz" - .global gUnknown_081A22A4 -gUnknown_081A22A4: - .incbin "graphics/evidence_profile_descriptions/001A22A4.4bpp.lz" + .global gGfxProfilesJackHammer_description +gGfxProfilesJackHammer_description: + .incbin "graphics/evidence_profile_descriptions/profiles/jack_hammer.4bpp.lz" - .global gUnknown_081A26BC -gUnknown_081A26BC: - .incbin "graphics/evidence_profile_descriptions/001A26BC.4bpp.lz" + .global gGfxProfilesPennyNichols_description +gGfxProfilesPennyNichols_description: + .incbin "graphics/evidence_profile_descriptions/profiles/penny_nichols.4bpp.lz" - .global gUnknown_081A2AE4 -gUnknown_081A2AE4: - .incbin "graphics/evidence_profile_descriptions/001A2AE4.4bpp.lz" + .global gGfxProfilesSalManella_description +gGfxProfilesSalManella_description: + .incbin "graphics/evidence_profile_descriptions/profiles/sal_manella.4bpp.lz" - .global gUnknown_081A2EE4 -gUnknown_081A2EE4: - .incbin "graphics/evidence_profile_descriptions/001A2EE4.4bpp.lz" + .global gGfxProfilesDeeVasquez_description +gGfxProfilesDeeVasquez_description: + .incbin "graphics/evidence_profile_descriptions/profiles/dee_vasquez.4bpp.lz" - .global gUnknown_081A3330 -gUnknown_081A3330: - .incbin "graphics/evidence_profile_descriptions/001A3330.4bpp.lz" + .global gGfxProfilesCodyHackins_description +gGfxProfilesCodyHackins_description: + .incbin "graphics/evidence_profile_descriptions/profiles/cody_hackins.4bpp.lz" - .global gUnknown_081A3714 -gUnknown_081A3714: - .incbin "graphics/evidence_profile_descriptions/001A3714.4bpp.lz" + .global gGfxEvidenceGenericAffidavit3_description +gGfxEvidenceGenericAffidavit3_description: + .incbin "graphics/evidence_profile_descriptions/evidence/generic_affidavit_3.4bpp.lz" - .global gUnknown_081A3B44 -gUnknown_081A3B44: - .incbin "graphics/evidence_profile_descriptions/001A3B44.4bpp.lz" + .global gGfxEvidenceGenericAutopsyReport3_description +gGfxEvidenceGenericAutopsyReport3_description: + .incbin "graphics/evidence_profile_descriptions/evidence/generic_autopsy_report_3.4bpp.lz" - .global gUnknown_081A3FF8 -gUnknown_081A3FF8: - .incbin "graphics/evidence_profile_descriptions/001A3FF8.4bpp.lz" + .global gGfxEvidenceGlobalStudiosCardKey_description +gGfxEvidenceGlobalStudiosCardKey_description: + .incbin "graphics/evidence_profile_descriptions/evidence/global_studios_card_key.4bpp.lz" - .global gUnknown_081A439C -gUnknown_081A439C: - .incbin "graphics/evidence_profile_descriptions/001A439C.4bpp.lz" + .global gGfxEvidenceGenericPhoto1_description +gGfxEvidenceGenericPhoto1_description: + .incbin "graphics/evidence_profile_descriptions/evidence/generic_photo_1.4bpp.lz" - .global gUnknown_081A47D4 -gUnknown_081A47D4: - .incbin "graphics/evidence_profile_descriptions/001A47D4.4bpp.lz" + .global gGfxEvidenceGenericPhoto2_description +gGfxEvidenceGenericPhoto2_description: + .incbin "graphics/evidence_profile_descriptions/evidence/generic_photo_2.4bpp.lz" - .global gUnknown_081A4BD4 -gUnknown_081A4BD4: - .incbin "graphics/evidence_profile_descriptions/001A4BD4.4bpp.lz" + .global gGfxEvidenceGenericPhoto3_description +gGfxEvidenceGenericPhoto3_description: + .incbin "graphics/evidence_profile_descriptions/evidence/generic_photo_3.4bpp.lz" - .global gUnknown_081A4FF0 -gUnknown_081A4FF0: - .incbin "graphics/evidence_profile_descriptions/001A4FF0.4bpp.lz" + .global gGfxEvidenceSteelSamuraiSpear0_description +gGfxEvidenceSteelSamuraiSpear0_description: + .incbin "graphics/evidence_profile_descriptions/evidence/steel_samurai_spear_0.4bpp.lz" - .global gUnknown_081A541C -gUnknown_081A541C: - .incbin "graphics/evidence_profile_descriptions/001A541C.4bpp.lz" + .global gGfxEvidenceSteelSamuraiSpear1_description +gGfxEvidenceSteelSamuraiSpear1_description: + .incbin "graphics/evidence_profile_descriptions/evidence/steel_samurai_spear_1.4bpp.lz" - .global gUnknown_081A5828 -gUnknown_081A5828: - .incbin "graphics/evidence_profile_descriptions/001A5828.4bpp.lz" + .global gGfxEvidenceEmptyBottle0_description +gGfxEvidenceEmptyBottle0_description: + .incbin "graphics/evidence_profile_descriptions/evidence/empty_bottle_0.4bpp.lz" - .global gUnknown_081A5BF4 -gUnknown_081A5BF4: - .incbin "graphics/evidence_profile_descriptions/001A5BF4.4bpp.lz" + .global gGfxEvidenceKeyToCottage_description +gGfxEvidenceKeyToCottage_description: + .incbin "graphics/evidence_profile_descriptions/evidence/key_to_cottage.4bpp.lz" - .global gUnknown_081A5FA4 -gUnknown_081A5FA4: - .incbin "graphics/evidence_profile_descriptions/001A5FA4.4bpp.lz" + .global gGfxEvidenceGenericLetter2_description +gGfxEvidenceGenericLetter2_description: + .incbin "graphics/evidence_profile_descriptions/evidence/generic_letter_2.4bpp.lz" - .global gUnknown_081A639C -gUnknown_081A639C: - .incbin "graphics/evidence_profile_descriptions/001A639C.4bpp.lz" + .global gGfxEvidenceSteelSamuraiScript_description +gGfxEvidenceSteelSamuraiScript_description: + .incbin "graphics/evidence_profile_descriptions/evidence/steel_samurai_script.4bpp.lz" - .global gUnknown_081A675C -gUnknown_081A675C: - .incbin "graphics/evidence_profile_descriptions/001A675C.4bpp.lz" + .global gGfxEvidenceMrMonkey_description +gGfxEvidenceMrMonkey_description: + .incbin "graphics/evidence_profile_descriptions/evidence/mr_monkey.4bpp.lz" - .global gUnknown_081A6B88 -gUnknown_081A6B88: - .incbin "graphics/evidence_profile_descriptions/001A6B88.4bpp.lz" + .global gGfxEvidenceSteelSamuraiCards_description +gGfxEvidenceSteelSamuraiCards_description: + .incbin "graphics/evidence_profile_descriptions/evidence/steel_samurai_cards.4bpp.lz" - .global gUnknown_081A6F68 -gUnknown_081A6F68: - .incbin "graphics/evidence_profile_descriptions/001A6F68.4bpp.lz" + .global gGfxEvidenceSteelSamuraiUltraRareCard_description +gGfxEvidenceSteelSamuraiUltraRareCard_description: + .incbin "graphics/evidence_profile_descriptions/evidence/steel_samurai_ultra_rare_card.4bpp.lz" - .global gUnknown_081A7310 -gUnknown_081A7310: - .incbin "graphics/evidence_profile_descriptions/001A7310.4bpp.lz" + .global gGfxEvidenceCodysSteelSamuraiScrapbook_description +gGfxEvidenceCodysSteelSamuraiScrapbook_description: + .incbin "graphics/evidence_profile_descriptions/evidence/codys_steel_samurai_scrapbook.4bpp.lz" - .global gUnknown_081A775C -gUnknown_081A775C: - .incbin "graphics/evidence_profile_descriptions/001A775C.4bpp.lz" + .global gGfxEvidenceCodysDigitalCamera_description +gGfxEvidenceCodysDigitalCamera_description: + .incbin "graphics/evidence_profile_descriptions/evidence/codys_digital_camera.4bpp.lz" - .global gUnknown_081A7B68 -gUnknown_081A7B68: - .incbin "graphics/evidence_profile_descriptions/001A7B68.4bpp.lz" + .global gGfxEvidencePlateWithSteakBones_description +gGfxEvidencePlateWithSteakBones_description: + .incbin "graphics/evidence_profile_descriptions/evidence/plate_with_steak_bones.4bpp.lz" - .global gUnknown_081A7FA4 -gUnknown_081A7FA4: - .incbin "graphics/evidence_profile_descriptions/001A7FA4.4bpp.lz" + .global gGfxEvidenceEmptyBottle1_description +gGfxEvidenceEmptyBottle1_description: + .incbin "graphics/evidence_profile_descriptions/evidence/empty_bottle_1.4bpp.lz" - .global gUnknown_081A83C4 -gUnknown_081A83C4: - .incbin "graphics/evidence_profile_descriptions/001A83C4.4bpp.lz" + .global gGfxEvidenceGenericPhoto4_description +gGfxEvidenceGenericPhoto4_description: + .incbin "graphics/evidence_profile_descriptions/evidence/generic_photo_4.4bpp.lz" - .global gUnknown_081A8828 -gUnknown_081A8828: - .incbin "graphics/evidence_profile_descriptions/001A8828.4bpp.lz" + .global gGfxEvidenceGlobalStudiosVan_description +gGfxEvidenceGlobalStudiosVan_description: + .incbin "graphics/evidence_profile_descriptions/evidence/global_studios_van.4bpp.lz" - .global gUnknown_081A8C30 -gUnknown_081A8C30: - .incbin "graphics/evidence_profile_descriptions/001A8C30.4bpp.lz" + .global gGfxEvidenceEmptyPlate_description +gGfxEvidenceEmptyPlate_description: + .incbin "graphics/evidence_profile_descriptions/evidence/empty_plate.4bpp.lz" - .global gUnknown_081A8F4C -gUnknown_081A8F4C: - .incbin "graphics/evidence_profile_descriptions/001A8F4C.4bpp.lz" + .global gGfxProfilesMilesEdgeworth1_description +gGfxProfilesMilesEdgeworth1_description: + .incbin "graphics/evidence_profile_descriptions/profiles/miles_edgeworth_1.4bpp.lz" - .global gUnknown_081A9380 -gUnknown_081A9380: - .incbin "graphics/evidence_profile_descriptions/001A9380.4bpp.lz" + .global gGfxProfilesLottaHart0_description +gGfxProfilesLottaHart0_description: + .incbin "graphics/evidence_profile_descriptions/profiles/lotta_hart_0.4bpp.lz" - .global gUnknown_081A97CC -gUnknown_081A97CC: - .incbin "graphics/evidence_profile_descriptions/001A97CC.4bpp.lz" + .global gGfxProfilesLottaHart1_description +gGfxProfilesLottaHart1_description: + .incbin "graphics/evidence_profile_descriptions/profiles/lotta_hart_1.4bpp.lz" - .global gUnknown_081A9BC8 -gUnknown_081A9BC8: - .incbin "graphics/evidence_profile_descriptions/001A9BC8.4bpp.lz" + .global gGfxProfilesLarryButz1_description +gGfxProfilesLarryButz1_description: + .incbin "graphics/evidence_profile_descriptions/profiles/larry_butz_1.4bpp.lz" - .global gUnknown_081AA054 -gUnknown_081AA054: - .incbin "graphics/evidence_profile_descriptions/001AA054.4bpp.lz" + .global gGfxProfilesRobertHammond_description +gGfxProfilesRobertHammond_description: + .incbin "graphics/evidence_profile_descriptions/profiles/robert_hammond.4bpp.lz" - .global gUnknown_081AA458 -gUnknown_081AA458: - .incbin "graphics/evidence_profile_descriptions/001AA458.4bpp.lz" + .global gGfxProfilesMistyFey1_description +gGfxProfilesMistyFey1_description: + .incbin "graphics/evidence_profile_descriptions/profiles/misty_fey_1.4bpp.lz" - .global gUnknown_081AA894 -gUnknown_081AA894: - .incbin "graphics/evidence_profile_descriptions/001AA894.4bpp.lz" + .global gGfxProfilesManfredVonKarma_description +gGfxProfilesManfredVonKarma_description: + .incbin "graphics/evidence_profile_descriptions/profiles/manfred_von_karma.4bpp.lz" - .global gUnknown_081AACDC -gUnknown_081AACDC: - .incbin "graphics/evidence_profile_descriptions/001AACDC.4bpp.lz" + .global gGfxProfilesGregoryEdgeworth_description +gGfxProfilesGregoryEdgeworth_description: + .incbin "graphics/evidence_profile_descriptions/profiles/gregory_edgeworth.4bpp.lz" - .global gUnknown_081AB178 -gUnknown_081AB178: - .incbin "graphics/evidence_profile_descriptions/001AB178.4bpp.lz" + .global gGfxProfilesOldMan0_description +gGfxProfilesOldMan0_description: + .incbin "graphics/evidence_profile_descriptions/profiles/old_man_0.4bpp.lz" - .global gUnknown_081AB574 -gUnknown_081AB574: - .incbin "graphics/evidence_profile_descriptions/001AB574.4bpp.lz" + .global gGfxProfilesOldMan1_description +gGfxProfilesOldMan1_description: + .incbin "graphics/evidence_profile_descriptions/profiles/old_man_1.4bpp.lz" - .global gUnknown_081AB9FC -gUnknown_081AB9FC: - .incbin "graphics/evidence_profile_descriptions/001AB9FC.4bpp.lz" + .global gGfxEvidenceFirecrackers_description +gGfxEvidenceFirecrackers_description: + .incbin "graphics/evidence_profile_descriptions/evidence/firecrackers.4bpp.lz" - .global gUnknown_081ABE00 -gUnknown_081ABE00: - .incbin "graphics/evidence_profile_descriptions/001ABE00.4bpp.lz" + .global gGfxEvidenceGenericAutopsyReport4_description +gGfxEvidenceGenericAutopsyReport4_description: + .incbin "graphics/evidence_profile_descriptions/evidence/generic_autopsy_report_4.4bpp.lz" - .global gUnknown_081AC2B0 -gUnknown_081AC2B0: - .incbin "graphics/evidence_profile_descriptions/001AC2B0.4bpp.lz" + .global gGfxEvidenceGenericAutopsyReport5_description +gGfxEvidenceGenericAutopsyReport5_description: + .incbin "graphics/evidence_profile_descriptions/evidence/generic_autopsy_report_5.4bpp.lz" - .global gUnknown_081AC75C -gUnknown_081AC75C: - .incbin "graphics/evidence_profile_descriptions/001AC75C.4bpp.lz" + .global gGfxEvidenceGenericAutopsyReport6_description +gGfxEvidenceGenericAutopsyReport6_description: + .incbin "graphics/evidence_profile_descriptions/evidence/generic_autopsy_report_6.4bpp.lz" - .global gUnknown_081ACBFC -gUnknown_081ACBFC: - .incbin "graphics/evidence_profile_descriptions/001ACBFC.4bpp.lz" + .global gGfxEvidenceLottasCamera1_description +gGfxEvidenceLottasCamera1_description: + .incbin "graphics/evidence_profile_descriptions/evidence/lottas_camera_1.4bpp.lz" - .global gUnknown_081AD02C -gUnknown_081AD02C: - .incbin "graphics/evidence_profile_descriptions/001AD02C.4bpp.lz" + .global gGfxEvidenceGenericPhoto5_description +gGfxEvidenceGenericPhoto5_description: + .incbin "graphics/evidence_profile_descriptions/evidence/generic_photo_5.4bpp.lz" - .global gUnknown_081AD448 -gUnknown_081AD448: - .incbin "graphics/evidence_profile_descriptions/001AD448.4bpp.lz" + .global gGfxEvidenceGenericPhoto6_description +gGfxEvidenceGenericPhoto6_description: + .incbin "graphics/evidence_profile_descriptions/evidence/generic_photo_6.4bpp.lz" - .global gUnknown_081AD864 -gUnknown_081AD864: - .incbin "graphics/evidence_profile_descriptions/001AD864.4bpp.lz" + .global gGfxEvidenceGenericPhoto7_description +gGfxEvidenceGenericPhoto7_description: + .incbin "graphics/evidence_profile_descriptions/evidence/generic_photo_7.4bpp.lz" - .global gUnknown_081ADCD4 -gUnknown_081ADCD4: - .incbin "graphics/evidence_profile_descriptions/001ADCD4.4bpp.lz" + .global gGfxProfilesMistyFey2_description +gGfxProfilesMistyFey2_description: + .incbin "graphics/evidence_profile_descriptions/profiles/misty_fey_2.4bpp.lz" - .global gUnknown_081AE0DC -gUnknown_081AE0DC: - .incbin "graphics/evidence_profile_descriptions/001AE0DC.4bpp.lz" + .global gGfxEvidenceArticleGourdy_description +gGfxEvidenceArticleGourdy_description: + .incbin "graphics/evidence_profile_descriptions/evidence/article_gourdy.4bpp.lz" - .global gUnknown_081AE4FC -gUnknown_081AE4FC: - .incbin "graphics/evidence_profile_descriptions/001AE4FC.4bpp.lz" + .global gGfxEvidenceGenericAffidavit4_description +gGfxEvidenceGenericAffidavit4_description: + .incbin "graphics/evidence_profile_descriptions/evidence/generic_affidavit_4.4bpp.lz" - .global gUnknown_081AE938 -gUnknown_081AE938: - .incbin "graphics/evidence_profile_descriptions/001AE938.4bpp.lz" + .global gGfxEvidenceGenericPhoto8_description +gGfxEvidenceGenericPhoto8_description: + .incbin "graphics/evidence_profile_descriptions/evidence/generic_photo_8.4bpp.lz" - .global gUnknown_081AED3C -gUnknown_081AED3C: - .incbin "graphics/evidence_profile_descriptions/001AED3C.4bpp.lz" + .global gGfxEvidenceBullet0_description +gGfxEvidenceBullet0_description: + .incbin "graphics/evidence_profile_descriptions/evidence/bullet_0.4bpp.lz" - .global gUnknown_081AF15C -gUnknown_081AF15C: - .incbin "graphics/evidence_profile_descriptions/001AF15C.4bpp.lz" + .global gGfxEvidenceBullet1_description +gGfxEvidenceBullet1_description: + .incbin "graphics/evidence_profile_descriptions/evidence/bullet_1.4bpp.lz" - .global gUnknown_081AF5A8 -gUnknown_081AF5A8: - .incbin "graphics/evidence_profile_descriptions/001AF5A8.4bpp.lz" + .global gGfxEvidencePistol_description +gGfxEvidencePistol_description: + .incbin "graphics/evidence_profile_descriptions/evidence/pistol.4bpp.lz" - .global gUnknown_081AF9DC -gUnknown_081AF9DC: - .incbin "graphics/evidence_profile_descriptions/001AF9DC.4bpp.lz" + .global gGfxEvidenceGenericAffidavit5_description +gGfxEvidenceGenericAffidavit5_description: + .incbin "graphics/evidence_profile_descriptions/evidence/generic_affidavit_5.4bpp.lz" - .global gUnknown_081AFE0C -gUnknown_081AFE0C: - .incbin "graphics/evidence_profile_descriptions/001AFE0C.4bpp.lz" + .global gGfxEvidenceAirTube_description +gGfxEvidenceAirTube_description: + .incbin "graphics/evidence_profile_descriptions/evidence/air_tube.4bpp.lz" - .global gUnknown_081B01D0 -gUnknown_081B01D0: - .incbin "graphics/evidence_profile_descriptions/001B01D0.4bpp.lz" + .global gGfxEvidenceMissile_description +gGfxEvidenceMissile_description: + .incbin "graphics/evidence_profile_descriptions/evidence/missile.4bpp.lz" - .global gUnknown_081B0594 -gUnknown_081B0594: - .incbin "graphics/evidence_profile_descriptions/001B0594.4bpp.lz" + .global gGfxEvidenceFishingPole_description +gGfxEvidenceFishingPole_description: + .incbin "graphics/evidence_profile_descriptions/evidence/fishing_pole.4bpp.lz" - .global gUnknown_081B0984 -gUnknown_081B0984: - .incbin "graphics/evidence_profile_descriptions/001B0984.4bpp.lz" + .global gGfxEvidenceMetalDetector_description +gGfxEvidenceMetalDetector_description: + .incbin "graphics/evidence_profile_descriptions/evidence/metal_detector.4bpp.lz" - .global gUnknown_081B0DC4 -gUnknown_081B0DC4: - .incbin "graphics/evidence_profile_descriptions/001B0DC4.4bpp.lz" + .global gGfxEvidencePolly_description +gGfxEvidencePolly_description: + .incbin "graphics/evidence_profile_descriptions/evidence/polly.4bpp.lz" - .global gUnknown_081B1150 -gUnknown_081B1150: - .incbin "graphics/evidence_profile_descriptions/001B1150.4bpp.lz" + .global gGfxEvidenceYannisSafe_description +gGfxEvidenceYannisSafe_description: + .incbin "graphics/evidence_profile_descriptions/evidence/yannis_safe.4bpp.lz" - .global gUnknown_081B14EC -gUnknown_081B14EC: - .incbin "graphics/evidence_profile_descriptions/001B14EC.4bpp.lz" + .global gGfxEvidenceGenericAutopsyReport7_description +gGfxEvidenceGenericAutopsyReport7_description: + .incbin "graphics/evidence_profile_descriptions/evidence/generic_autopsy_report_7.4bpp.lz" - .global gUnknown_081B18C0 -gUnknown_081B18C0: - .incbin "graphics/evidence_profile_descriptions/001B18C0.4bpp.lz" + .global gGfxEvidenceGenericPhoto9_description +gGfxEvidenceGenericPhoto9_description: + .incbin "graphics/evidence_profile_descriptions/evidence/generic_photo_9.4bpp.lz" - .global gUnknown_081B1CBC -gUnknown_081B1CBC: - .incbin "graphics/evidence_profile_descriptions/001B1CBC.4bpp.lz" + .global gGfxEvidenceGenericLetter3_description +gGfxEvidenceGenericLetter3_description: + .incbin "graphics/evidence_profile_descriptions/evidence/generic_letter_3.4bpp.lz" - .global gUnknown_081B2150 -gUnknown_081B2150: - .incbin "graphics/evidence_profile_descriptions/001B2150.4bpp.lz" + .global gGfxEvidenceDl6Bullet_description +gGfxEvidenceDl6Bullet_description: + .incbin "graphics/evidence_profile_descriptions/evidence/dl-6_bullet.4bpp.lz" - .global gUnknown_081B25F0 -gUnknown_081B25F0: - .incbin "graphics/evidence_profile_descriptions/001B25F0.4bpp.lz" + .global gGfxEvidenceMissileAngry_description +gGfxEvidenceMissileAngry_description: + .incbin "graphics/evidence_profile_descriptions/evidence/missile_angry.4bpp.lz" @ END EVIDENCE AND PROFILE DESCRIPTIONS diff --git a/graphics/evidence_profile_descriptions/001AFE0C.png b/graphics/evidence_profile_descriptions/evidence/air_tube.png similarity index 100% rename from graphics/evidence_profile_descriptions/001AFE0C.png rename to graphics/evidence_profile_descriptions/evidence/air_tube.png diff --git a/graphics/evidence_profile_descriptions/001AE0DC.png b/graphics/evidence_profile_descriptions/evidence/article_gourdy.png similarity index 100% rename from graphics/evidence_profile_descriptions/001AE0DC.png rename to graphics/evidence_profile_descriptions/evidence/article_gourdy.png diff --git a/graphics/evidence_profile_descriptions/001AED3C.png b/graphics/evidence_profile_descriptions/evidence/bullet_0.png similarity index 100% rename from graphics/evidence_profile_descriptions/001AED3C.png rename to graphics/evidence_profile_descriptions/evidence/bullet_0.png diff --git a/graphics/evidence_profile_descriptions/001AF15C.png b/graphics/evidence_profile_descriptions/evidence/bullet_1.png similarity index 100% rename from graphics/evidence_profile_descriptions/001AF15C.png rename to graphics/evidence_profile_descriptions/evidence/bullet_1.png diff --git a/graphics/evidence_profile_descriptions/00198E5C.png b/graphics/evidence_profile_descriptions/evidence/cindy_stones_passport.png similarity index 100% rename from graphics/evidence_profile_descriptions/00198E5C.png rename to graphics/evidence_profile_descriptions/evidence/cindy_stones_passport.png diff --git a/graphics/evidence_profile_descriptions/001A775C.png b/graphics/evidence_profile_descriptions/evidence/codys_digital_camera.png similarity index 100% rename from graphics/evidence_profile_descriptions/001A775C.png rename to graphics/evidence_profile_descriptions/evidence/codys_digital_camera.png diff --git a/graphics/evidence_profile_descriptions/001A7310.png b/graphics/evidence_profile_descriptions/evidence/codys_steel_samurai_scrapbook.png similarity index 100% rename from graphics/evidence_profile_descriptions/001A7310.png rename to graphics/evidence_profile_descriptions/evidence/codys_steel_samurai_scrapbook.png diff --git a/graphics/evidence_profile_descriptions/001B2150.png b/graphics/evidence_profile_descriptions/evidence/dl-6_bullet.png similarity index 100% rename from graphics/evidence_profile_descriptions/001B2150.png rename to graphics/evidence_profile_descriptions/evidence/dl-6_bullet.png diff --git a/graphics/evidence_profile_descriptions/001A5828.png b/graphics/evidence_profile_descriptions/evidence/empty_bottle_0.png similarity index 100% rename from graphics/evidence_profile_descriptions/001A5828.png rename to graphics/evidence_profile_descriptions/evidence/empty_bottle_0.png diff --git a/graphics/evidence_profile_descriptions/001A7FA4.png b/graphics/evidence_profile_descriptions/evidence/empty_bottle_1.png similarity index 100% rename from graphics/evidence_profile_descriptions/001A7FA4.png rename to graphics/evidence_profile_descriptions/evidence/empty_bottle_1.png diff --git a/graphics/evidence_profile_descriptions/001A8C30.png b/graphics/evidence_profile_descriptions/evidence/empty_plate.png similarity index 100% rename from graphics/evidence_profile_descriptions/001A8C30.png rename to graphics/evidence_profile_descriptions/evidence/empty_plate.png diff --git a/graphics/evidence_profile_descriptions/001AB9FC.png b/graphics/evidence_profile_descriptions/evidence/firecrackers.png similarity index 100% rename from graphics/evidence_profile_descriptions/001AB9FC.png rename to graphics/evidence_profile_descriptions/evidence/firecrackers.png diff --git a/graphics/evidence_profile_descriptions/001B0594.png b/graphics/evidence_profile_descriptions/evidence/fishing_pole.png similarity index 100% rename from graphics/evidence_profile_descriptions/001B0594.png rename to graphics/evidence_profile_descriptions/evidence/fishing_pole.png diff --git a/graphics/evidence_profile_descriptions/00199228.png b/graphics/evidence_profile_descriptions/evidence/generic_affidavit_0.png similarity index 100% rename from graphics/evidence_profile_descriptions/00199228.png rename to graphics/evidence_profile_descriptions/evidence/generic_affidavit_0.png diff --git a/graphics/evidence_profile_descriptions/0019F5C0.png b/graphics/evidence_profile_descriptions/evidence/generic_affidavit_1.png similarity index 100% rename from graphics/evidence_profile_descriptions/0019F5C0.png rename to graphics/evidence_profile_descriptions/evidence/generic_affidavit_1.png diff --git a/graphics/evidence_profile_descriptions/001A09E4.png b/graphics/evidence_profile_descriptions/evidence/generic_affidavit_2.png similarity index 100% rename from graphics/evidence_profile_descriptions/001A09E4.png rename to graphics/evidence_profile_descriptions/evidence/generic_affidavit_2.png diff --git a/graphics/evidence_profile_descriptions/001A3714.png b/graphics/evidence_profile_descriptions/evidence/generic_affidavit_3.png similarity index 100% rename from graphics/evidence_profile_descriptions/001A3714.png rename to graphics/evidence_profile_descriptions/evidence/generic_affidavit_3.png diff --git a/graphics/evidence_profile_descriptions/001AE4FC.png b/graphics/evidence_profile_descriptions/evidence/generic_affidavit_4.png similarity index 100% rename from graphics/evidence_profile_descriptions/001AE4FC.png rename to graphics/evidence_profile_descriptions/evidence/generic_affidavit_4.png diff --git a/graphics/evidence_profile_descriptions/001AF9DC.png b/graphics/evidence_profile_descriptions/evidence/generic_affidavit_5.png similarity index 100% rename from graphics/evidence_profile_descriptions/001AF9DC.png rename to graphics/evidence_profile_descriptions/evidence/generic_affidavit_5.png diff --git a/graphics/evidence_profile_descriptions/001985D8.png b/graphics/evidence_profile_descriptions/evidence/generic_autopsy_report_0.png similarity index 100% rename from graphics/evidence_profile_descriptions/001985D8.png rename to graphics/evidence_profile_descriptions/evidence/generic_autopsy_report_0.png diff --git a/graphics/evidence_profile_descriptions/0019D028.png b/graphics/evidence_profile_descriptions/evidence/generic_autopsy_report_1.png similarity index 100% rename from graphics/evidence_profile_descriptions/0019D028.png rename to graphics/evidence_profile_descriptions/evidence/generic_autopsy_report_1.png diff --git a/graphics/evidence_profile_descriptions/001A0E58.png b/graphics/evidence_profile_descriptions/evidence/generic_autopsy_report_2.png similarity index 100% rename from graphics/evidence_profile_descriptions/001A0E58.png rename to graphics/evidence_profile_descriptions/evidence/generic_autopsy_report_2.png diff --git a/graphics/evidence_profile_descriptions/001A3B44.png b/graphics/evidence_profile_descriptions/evidence/generic_autopsy_report_3.png similarity index 100% rename from graphics/evidence_profile_descriptions/001A3B44.png rename to graphics/evidence_profile_descriptions/evidence/generic_autopsy_report_3.png diff --git a/graphics/evidence_profile_descriptions/001ABE00.png b/graphics/evidence_profile_descriptions/evidence/generic_autopsy_report_4.png similarity index 100% rename from graphics/evidence_profile_descriptions/001ABE00.png rename to graphics/evidence_profile_descriptions/evidence/generic_autopsy_report_4.png diff --git a/graphics/evidence_profile_descriptions/001AC2B0.png b/graphics/evidence_profile_descriptions/evidence/generic_autopsy_report_5.png similarity index 100% rename from graphics/evidence_profile_descriptions/001AC2B0.png rename to graphics/evidence_profile_descriptions/evidence/generic_autopsy_report_5.png diff --git a/graphics/evidence_profile_descriptions/001AC75C.png b/graphics/evidence_profile_descriptions/evidence/generic_autopsy_report_6.png similarity index 100% rename from graphics/evidence_profile_descriptions/001AC75C.png rename to graphics/evidence_profile_descriptions/evidence/generic_autopsy_report_6.png diff --git a/graphics/evidence_profile_descriptions/001B14EC.png b/graphics/evidence_profile_descriptions/evidence/generic_autopsy_report_7.png similarity index 100% rename from graphics/evidence_profile_descriptions/001B14EC.png rename to graphics/evidence_profile_descriptions/evidence/generic_autopsy_report_7.png diff --git a/graphics/evidence_profile_descriptions/0019D4C8.png b/graphics/evidence_profile_descriptions/evidence/generic_letter_0.png similarity index 100% rename from graphics/evidence_profile_descriptions/0019D4C8.png rename to graphics/evidence_profile_descriptions/evidence/generic_letter_0.png diff --git a/graphics/evidence_profile_descriptions/001A1324.png b/graphics/evidence_profile_descriptions/evidence/generic_letter_1.png similarity index 100% rename from graphics/evidence_profile_descriptions/001A1324.png rename to graphics/evidence_profile_descriptions/evidence/generic_letter_1.png diff --git a/graphics/evidence_profile_descriptions/001A5FA4.png b/graphics/evidence_profile_descriptions/evidence/generic_letter_2.png similarity index 100% rename from graphics/evidence_profile_descriptions/001A5FA4.png rename to graphics/evidence_profile_descriptions/evidence/generic_letter_2.png diff --git a/graphics/evidence_profile_descriptions/001B1CBC.png b/graphics/evidence_profile_descriptions/evidence/generic_letter_3.png similarity index 100% rename from graphics/evidence_profile_descriptions/001B1CBC.png rename to graphics/evidence_profile_descriptions/evidence/generic_letter_3.png diff --git a/graphics/evidence_profile_descriptions/001A0120.png b/graphics/evidence_profile_descriptions/evidence/generic_newspaper_clipping.png similarity index 100% rename from graphics/evidence_profile_descriptions/001A0120.png rename to graphics/evidence_profile_descriptions/evidence/generic_newspaper_clipping.png diff --git a/graphics/evidence_profile_descriptions/001A0580.png b/graphics/evidence_profile_descriptions/evidence/generic_photo_0.png similarity index 100% rename from graphics/evidence_profile_descriptions/001A0580.png rename to graphics/evidence_profile_descriptions/evidence/generic_photo_0.png diff --git a/graphics/evidence_profile_descriptions/001A439C.png b/graphics/evidence_profile_descriptions/evidence/generic_photo_1.png similarity index 100% rename from graphics/evidence_profile_descriptions/001A439C.png rename to graphics/evidence_profile_descriptions/evidence/generic_photo_1.png diff --git a/graphics/evidence_profile_descriptions/001A47D4.png b/graphics/evidence_profile_descriptions/evidence/generic_photo_2.png similarity index 100% rename from graphics/evidence_profile_descriptions/001A47D4.png rename to graphics/evidence_profile_descriptions/evidence/generic_photo_2.png diff --git a/graphics/evidence_profile_descriptions/001A4BD4.png b/graphics/evidence_profile_descriptions/evidence/generic_photo_3.png similarity index 100% rename from graphics/evidence_profile_descriptions/001A4BD4.png rename to graphics/evidence_profile_descriptions/evidence/generic_photo_3.png diff --git a/graphics/evidence_profile_descriptions/001A83C4.png b/graphics/evidence_profile_descriptions/evidence/generic_photo_4.png similarity index 100% rename from graphics/evidence_profile_descriptions/001A83C4.png rename to graphics/evidence_profile_descriptions/evidence/generic_photo_4.png diff --git a/graphics/evidence_profile_descriptions/001AD02C.png b/graphics/evidence_profile_descriptions/evidence/generic_photo_5.png similarity index 100% rename from graphics/evidence_profile_descriptions/001AD02C.png rename to graphics/evidence_profile_descriptions/evidence/generic_photo_5.png diff --git a/graphics/evidence_profile_descriptions/001AD448.png b/graphics/evidence_profile_descriptions/evidence/generic_photo_6.png similarity index 100% rename from graphics/evidence_profile_descriptions/001AD448.png rename to graphics/evidence_profile_descriptions/evidence/generic_photo_6.png diff --git a/graphics/evidence_profile_descriptions/001AD864.png b/graphics/evidence_profile_descriptions/evidence/generic_photo_7.png similarity index 100% rename from graphics/evidence_profile_descriptions/001AD864.png rename to graphics/evidence_profile_descriptions/evidence/generic_photo_7.png diff --git a/graphics/evidence_profile_descriptions/001AE938.png b/graphics/evidence_profile_descriptions/evidence/generic_photo_8.png similarity index 100% rename from graphics/evidence_profile_descriptions/001AE938.png rename to graphics/evidence_profile_descriptions/evidence/generic_photo_8.png diff --git a/graphics/evidence_profile_descriptions/001B18C0.png b/graphics/evidence_profile_descriptions/evidence/generic_photo_9.png similarity index 100% rename from graphics/evidence_profile_descriptions/001B18C0.png rename to graphics/evidence_profile_descriptions/evidence/generic_photo_9.png diff --git a/graphics/evidence_profile_descriptions/0019DDAC.png b/graphics/evidence_profile_descriptions/evidence/glass_shards.png similarity index 100% rename from graphics/evidence_profile_descriptions/0019DDAC.png rename to graphics/evidence_profile_descriptions/evidence/glass_shards.png diff --git a/graphics/evidence_profile_descriptions/001A3FF8.png b/graphics/evidence_profile_descriptions/evidence/global_studios_card_key.png similarity index 100% rename from graphics/evidence_profile_descriptions/001A3FF8.png rename to graphics/evidence_profile_descriptions/evidence/global_studios_card_key.png diff --git a/graphics/evidence_profile_descriptions/001A8828.png b/graphics/evidence_profile_descriptions/evidence/global_studios_van.png similarity index 100% rename from graphics/evidence_profile_descriptions/001A8828.png rename to graphics/evidence_profile_descriptions/evidence/global_studios_van.png diff --git a/graphics/evidence_profile_descriptions/001A5BF4.png b/graphics/evidence_profile_descriptions/evidence/key_to_cottage.png similarity index 100% rename from graphics/evidence_profile_descriptions/001A5BF4.png rename to graphics/evidence_profile_descriptions/evidence/key_to_cottage.png diff --git a/graphics/evidence_profile_descriptions/001A1728.png b/graphics/evidence_profile_descriptions/evidence/lottas_camera_0.png similarity index 100% rename from graphics/evidence_profile_descriptions/001A1728.png rename to graphics/evidence_profile_descriptions/evidence/lottas_camera_0.png diff --git a/graphics/evidence_profile_descriptions/001ACBFC.png b/graphics/evidence_profile_descriptions/evidence/lottas_camera_1.png similarity index 100% rename from graphics/evidence_profile_descriptions/001ACBFC.png rename to graphics/evidence_profile_descriptions/evidence/lottas_camera_1.png diff --git a/graphics/evidence_profile_descriptions/0019E9D8.png b/graphics/evidence_profile_descriptions/evidence/maya_memo.png similarity index 100% rename from graphics/evidence_profile_descriptions/0019E9D8.png rename to graphics/evidence_profile_descriptions/evidence/maya_memo.png diff --git a/graphics/evidence_profile_descriptions/0019D90C.png b/graphics/evidence_profile_descriptions/evidence/mayas_cellphone.png similarity index 100% rename from graphics/evidence_profile_descriptions/0019D90C.png rename to graphics/evidence_profile_descriptions/evidence/mayas_cellphone.png diff --git a/graphics/evidence_profile_descriptions/001B0984.png b/graphics/evidence_profile_descriptions/evidence/metal_detector.png similarity index 100% rename from graphics/evidence_profile_descriptions/001B0984.png rename to graphics/evidence_profile_descriptions/evidence/metal_detector.png diff --git a/graphics/evidence_profile_descriptions/001B01D0.png b/graphics/evidence_profile_descriptions/evidence/missile.png similarity index 100% rename from graphics/evidence_profile_descriptions/001B01D0.png rename to graphics/evidence_profile_descriptions/evidence/missile.png diff --git a/graphics/evidence_profile_descriptions/001B25F0.png b/graphics/evidence_profile_descriptions/evidence/missile_angry.png similarity index 100% rename from graphics/evidence_profile_descriptions/001B25F0.png rename to graphics/evidence_profile_descriptions/evidence/missile_angry.png diff --git a/graphics/evidence_profile_descriptions/001A675C.png b/graphics/evidence_profile_descriptions/evidence/mr_monkey.png similarity index 100% rename from graphics/evidence_profile_descriptions/001A675C.png rename to graphics/evidence_profile_descriptions/evidence/mr_monkey.png diff --git a/graphics/evidence_profile_descriptions/0019EDF0.png b/graphics/evidence_profile_descriptions/evidence/note_from_the_safe.png similarity index 100% rename from graphics/evidence_profile_descriptions/0019EDF0.png rename to graphics/evidence_profile_descriptions/evidence/note_from_the_safe.png diff --git a/graphics/evidence_profile_descriptions/0019CC44.png b/graphics/evidence_profile_descriptions/evidence/phoenix_badge.png similarity index 100% rename from graphics/evidence_profile_descriptions/0019CC44.png rename to graphics/evidence_profile_descriptions/evidence/phoenix_badge.png diff --git a/graphics/evidence_profile_descriptions/001AF5A8.png b/graphics/evidence_profile_descriptions/evidence/pistol.png similarity index 100% rename from graphics/evidence_profile_descriptions/001AF5A8.png rename to graphics/evidence_profile_descriptions/evidence/pistol.png diff --git a/graphics/evidence_profile_descriptions/001A7B68.png b/graphics/evidence_profile_descriptions/evidence/plate_with_steak_bones.png similarity index 100% rename from graphics/evidence_profile_descriptions/001A7B68.png rename to graphics/evidence_profile_descriptions/evidence/plate_with_steak_bones.png diff --git a/graphics/evidence_profile_descriptions/001B0DC4.png b/graphics/evidence_profile_descriptions/evidence/polly.png similarity index 100% rename from graphics/evidence_profile_descriptions/001B0DC4.png rename to graphics/evidence_profile_descriptions/evidence/polly.png diff --git a/graphics/evidence_profile_descriptions/001A6B88.png b/graphics/evidence_profile_descriptions/evidence/steel_samurai_cards.png similarity index 100% rename from graphics/evidence_profile_descriptions/001A6B88.png rename to graphics/evidence_profile_descriptions/evidence/steel_samurai_cards.png diff --git a/graphics/evidence_profile_descriptions/001A639C.png b/graphics/evidence_profile_descriptions/evidence/steel_samurai_script.png similarity index 100% rename from graphics/evidence_profile_descriptions/001A639C.png rename to graphics/evidence_profile_descriptions/evidence/steel_samurai_script.png diff --git a/graphics/evidence_profile_descriptions/001A4FF0.png b/graphics/evidence_profile_descriptions/evidence/steel_samurai_spear_0.png similarity index 100% rename from graphics/evidence_profile_descriptions/001A4FF0.png rename to graphics/evidence_profile_descriptions/evidence/steel_samurai_spear_0.png diff --git a/graphics/evidence_profile_descriptions/001A541C.png b/graphics/evidence_profile_descriptions/evidence/steel_samurai_spear_1.png similarity index 100% rename from graphics/evidence_profile_descriptions/001A541C.png rename to graphics/evidence_profile_descriptions/evidence/steel_samurai_spear_1.png diff --git a/graphics/evidence_profile_descriptions/001A6F68.png b/graphics/evidence_profile_descriptions/evidence/steel_samurai_ultra_rare_card.png similarity index 100% rename from graphics/evidence_profile_descriptions/001A6F68.png rename to graphics/evidence_profile_descriptions/evidence/steel_samurai_ultra_rare_card.png diff --git a/graphics/evidence_profile_descriptions/00198A84.png b/graphics/evidence_profile_descriptions/evidence/the_thinker_0.png similarity index 100% rename from graphics/evidence_profile_descriptions/00198A84.png rename to graphics/evidence_profile_descriptions/evidence/the_thinker_0.png diff --git a/graphics/evidence_profile_descriptions/0019E18C.png b/graphics/evidence_profile_descriptions/evidence/the_thinker_1.png similarity index 100% rename from graphics/evidence_profile_descriptions/0019E18C.png rename to graphics/evidence_profile_descriptions/evidence/the_thinker_1.png diff --git a/graphics/evidence_profile_descriptions/0019E5A0.png b/graphics/evidence_profile_descriptions/evidence/the_thinker_2.png similarity index 100% rename from graphics/evidence_profile_descriptions/0019E5A0.png rename to graphics/evidence_profile_descriptions/evidence/the_thinker_2.png diff --git a/graphics/evidence_profile_descriptions/0019F208.png b/graphics/evidence_profile_descriptions/evidence/wiretap.png similarity index 100% rename from graphics/evidence_profile_descriptions/0019F208.png rename to graphics/evidence_profile_descriptions/evidence/wiretap.png diff --git a/graphics/evidence_profile_descriptions/001B1150.png b/graphics/evidence_profile_descriptions/evidence/yannis_safe.png similarity index 100% rename from graphics/evidence_profile_descriptions/001B1150.png rename to graphics/evidence_profile_descriptions/evidence/yannis_safe.png diff --git a/graphics/evidence_profile_descriptions/0019B028.png b/graphics/evidence_profile_descriptions/profiles/april_may_0.png similarity index 100% rename from graphics/evidence_profile_descriptions/0019B028.png rename to graphics/evidence_profile_descriptions/profiles/april_may_0.png diff --git a/graphics/evidence_profile_descriptions/0019B428.png b/graphics/evidence_profile_descriptions/profiles/april_may_1.png similarity index 100% rename from graphics/evidence_profile_descriptions/0019B428.png rename to graphics/evidence_profile_descriptions/profiles/april_may_1.png diff --git a/graphics/evidence_profile_descriptions/0019B868.png b/graphics/evidence_profile_descriptions/profiles/april_may_2.png similarity index 100% rename from graphics/evidence_profile_descriptions/0019B868.png rename to graphics/evidence_profile_descriptions/profiles/april_may_2.png diff --git a/graphics/evidence_profile_descriptions/0019C0D8.png b/graphics/evidence_profile_descriptions/profiles/bellboy_0.png similarity index 100% rename from graphics/evidence_profile_descriptions/0019C0D8.png rename to graphics/evidence_profile_descriptions/profiles/bellboy_0.png diff --git a/graphics/evidence_profile_descriptions/0019C434.png b/graphics/evidence_profile_descriptions/profiles/bellboy_1.png similarity index 100% rename from graphics/evidence_profile_descriptions/0019C434.png rename to graphics/evidence_profile_descriptions/profiles/bellboy_1.png diff --git a/graphics/evidence_profile_descriptions/00197928.png b/graphics/evidence_profile_descriptions/profiles/cindy_stone.png similarity index 100% rename from graphics/evidence_profile_descriptions/00197928.png rename to graphics/evidence_profile_descriptions/profiles/cindy_stone.png diff --git a/graphics/evidence_profile_descriptions/001A3330.png b/graphics/evidence_profile_descriptions/profiles/cody_hackins.png similarity index 100% rename from graphics/evidence_profile_descriptions/001A3330.png rename to graphics/evidence_profile_descriptions/profiles/cody_hackins.png diff --git a/graphics/evidence_profile_descriptions/001A2EE4.png b/graphics/evidence_profile_descriptions/profiles/dee_vasquez.png similarity index 100% rename from graphics/evidence_profile_descriptions/001A2EE4.png rename to graphics/evidence_profile_descriptions/profiles/dee_vasquez.png diff --git a/graphics/evidence_profile_descriptions/0019ABBC.png b/graphics/evidence_profile_descriptions/profiles/dick_gumshoe.png similarity index 100% rename from graphics/evidence_profile_descriptions/0019ABBC.png rename to graphics/evidence_profile_descriptions/profiles/dick_gumshoe.png diff --git a/graphics/evidence_profile_descriptions/00197D18.png b/graphics/evidence_profile_descriptions/profiles/frank_sahwit.png similarity index 100% rename from graphics/evidence_profile_descriptions/00197D18.png rename to graphics/evidence_profile_descriptions/profiles/frank_sahwit.png diff --git a/graphics/evidence_profile_descriptions/001AACDC.png b/graphics/evidence_profile_descriptions/profiles/gregory_edgeworth.png similarity index 100% rename from graphics/evidence_profile_descriptions/001AACDC.png rename to graphics/evidence_profile_descriptions/profiles/gregory_edgeworth.png diff --git a/graphics/evidence_profile_descriptions/001A22A4.png b/graphics/evidence_profile_descriptions/profiles/jack_hammer.png similarity index 100% rename from graphics/evidence_profile_descriptions/001A22A4.png rename to graphics/evidence_profile_descriptions/profiles/jack_hammer.png diff --git a/graphics/evidence_profile_descriptions/00197514.png b/graphics/evidence_profile_descriptions/profiles/larry_butz_0.png similarity index 100% rename from graphics/evidence_profile_descriptions/00197514.png rename to graphics/evidence_profile_descriptions/profiles/larry_butz_0.png diff --git a/graphics/evidence_profile_descriptions/001A9BC8.png b/graphics/evidence_profile_descriptions/profiles/larry_butz_1.png similarity index 100% rename from graphics/evidence_profile_descriptions/001A9BC8.png rename to graphics/evidence_profile_descriptions/profiles/larry_butz_1.png diff --git a/graphics/evidence_profile_descriptions/001A9380.png b/graphics/evidence_profile_descriptions/profiles/lotta_hart_0.png similarity index 100% rename from graphics/evidence_profile_descriptions/001A9380.png rename to graphics/evidence_profile_descriptions/profiles/lotta_hart_0.png diff --git a/graphics/evidence_profile_descriptions/001A97CC.png b/graphics/evidence_profile_descriptions/profiles/lotta_hart_1.png similarity index 100% rename from graphics/evidence_profile_descriptions/001A97CC.png rename to graphics/evidence_profile_descriptions/profiles/lotta_hart_1.png diff --git a/graphics/evidence_profile_descriptions/001AA894.png b/graphics/evidence_profile_descriptions/profiles/manfred_von_karma.png similarity index 100% rename from graphics/evidence_profile_descriptions/001AA894.png rename to graphics/evidence_profile_descriptions/profiles/manfred_von_karma.png diff --git a/graphics/evidence_profile_descriptions/0019C810.png b/graphics/evidence_profile_descriptions/profiles/marvin_grossberg.png similarity index 100% rename from graphics/evidence_profile_descriptions/0019C810.png rename to graphics/evidence_profile_descriptions/profiles/marvin_grossberg.png diff --git a/graphics/evidence_profile_descriptions/001970DC.png b/graphics/evidence_profile_descriptions/profiles/maya_fey_0.png similarity index 100% rename from graphics/evidence_profile_descriptions/001970DC.png rename to graphics/evidence_profile_descriptions/profiles/maya_fey_0.png diff --git a/graphics/evidence_profile_descriptions/00199AEC.png b/graphics/evidence_profile_descriptions/profiles/maya_fey_1.png similarity index 100% rename from graphics/evidence_profile_descriptions/00199AEC.png rename to graphics/evidence_profile_descriptions/profiles/maya_fey_1.png diff --git a/graphics/evidence_profile_descriptions/00199EC8.png b/graphics/evidence_profile_descriptions/profiles/maya_fey_2.png similarity index 100% rename from graphics/evidence_profile_descriptions/00199EC8.png rename to graphics/evidence_profile_descriptions/profiles/maya_fey_2.png diff --git a/graphics/evidence_profile_descriptions/0019A2E4.png b/graphics/evidence_profile_descriptions/profiles/maya_fey_3.png similarity index 100% rename from graphics/evidence_profile_descriptions/0019A2E4.png rename to graphics/evidence_profile_descriptions/profiles/maya_fey_3.png diff --git a/graphics/evidence_profile_descriptions/00196CA8.png b/graphics/evidence_profile_descriptions/profiles/mia_fey_0.png similarity index 100% rename from graphics/evidence_profile_descriptions/00196CA8.png rename to graphics/evidence_profile_descriptions/profiles/mia_fey_0.png diff --git a/graphics/evidence_profile_descriptions/00199690.png b/graphics/evidence_profile_descriptions/profiles/mia_fey_1.png similarity index 100% rename from graphics/evidence_profile_descriptions/00199690.png rename to graphics/evidence_profile_descriptions/profiles/mia_fey_1.png diff --git a/graphics/evidence_profile_descriptions/0019A700.png b/graphics/evidence_profile_descriptions/profiles/miles_edgeworth_0.png similarity index 100% rename from graphics/evidence_profile_descriptions/0019A700.png rename to graphics/evidence_profile_descriptions/profiles/miles_edgeworth_0.png diff --git a/graphics/evidence_profile_descriptions/001A8F4C.png b/graphics/evidence_profile_descriptions/profiles/miles_edgeworth_1.png similarity index 100% rename from graphics/evidence_profile_descriptions/001A8F4C.png rename to graphics/evidence_profile_descriptions/profiles/miles_edgeworth_1.png diff --git a/graphics/evidence_profile_descriptions/0019F9E8.png b/graphics/evidence_profile_descriptions/profiles/misty_fey_0.png similarity index 100% rename from graphics/evidence_profile_descriptions/0019F9E8.png rename to graphics/evidence_profile_descriptions/profiles/misty_fey_0.png diff --git a/graphics/evidence_profile_descriptions/001AA458.png b/graphics/evidence_profile_descriptions/profiles/misty_fey_1.png similarity index 100% rename from graphics/evidence_profile_descriptions/001AA458.png rename to graphics/evidence_profile_descriptions/profiles/misty_fey_1.png diff --git a/graphics/evidence_profile_descriptions/001ADCD4.png b/graphics/evidence_profile_descriptions/profiles/misty_fey_2.png similarity index 100% rename from graphics/evidence_profile_descriptions/001ADCD4.png rename to graphics/evidence_profile_descriptions/profiles/misty_fey_2.png diff --git a/graphics/evidence_profile_descriptions/001AB178.png b/graphics/evidence_profile_descriptions/profiles/old_man_0.png similarity index 100% rename from graphics/evidence_profile_descriptions/001AB178.png rename to graphics/evidence_profile_descriptions/profiles/old_man_0.png diff --git a/graphics/evidence_profile_descriptions/001AB574.png b/graphics/evidence_profile_descriptions/profiles/old_man_1.png similarity index 100% rename from graphics/evidence_profile_descriptions/001AB574.png rename to graphics/evidence_profile_descriptions/profiles/old_man_1.png diff --git a/graphics/evidence_profile_descriptions/001A26BC.png b/graphics/evidence_profile_descriptions/profiles/penny_nichols.png similarity index 100% rename from graphics/evidence_profile_descriptions/001A26BC.png rename to graphics/evidence_profile_descriptions/profiles/penny_nichols.png diff --git a/graphics/evidence_profile_descriptions/0019BCE4.png b/graphics/evidence_profile_descriptions/profiles/redd_white_0.png similarity index 100% rename from graphics/evidence_profile_descriptions/0019BCE4.png rename to graphics/evidence_profile_descriptions/profiles/redd_white_0.png diff --git a/graphics/evidence_profile_descriptions/0019FD84.png b/graphics/evidence_profile_descriptions/profiles/redd_white_1.png similarity index 100% rename from graphics/evidence_profile_descriptions/0019FD84.png rename to graphics/evidence_profile_descriptions/profiles/redd_white_1.png diff --git a/graphics/evidence_profile_descriptions/001AA054.png b/graphics/evidence_profile_descriptions/profiles/robert_hammond.png similarity index 100% rename from graphics/evidence_profile_descriptions/001AA054.png rename to graphics/evidence_profile_descriptions/profiles/robert_hammond.png diff --git a/graphics/evidence_profile_descriptions/001A2AE4.png b/graphics/evidence_profile_descriptions/profiles/sal_manella.png similarity index 100% rename from graphics/evidence_profile_descriptions/001A2AE4.png rename to graphics/evidence_profile_descriptions/profiles/sal_manella.png diff --git a/graphics/evidence_profile_descriptions/001A1E1C.png b/graphics/evidence_profile_descriptions/profiles/wendy_oldbag.png similarity index 100% rename from graphics/evidence_profile_descriptions/001A1E1C.png rename to graphics/evidence_profile_descriptions/profiles/wendy_oldbag.png diff --git a/graphics/evidence_profile_descriptions/001A1A10.png b/graphics/evidence_profile_descriptions/profiles/will_powers.png similarity index 100% rename from graphics/evidence_profile_descriptions/001A1A10.png rename to graphics/evidence_profile_descriptions/profiles/will_powers.png diff --git a/graphics/evidence_profile_descriptions/001981A0.png b/graphics/evidence_profile_descriptions/profiles/winston_payne.png similarity index 100% rename from graphics/evidence_profile_descriptions/001981A0.png rename to graphics/evidence_profile_descriptions/profiles/winston_payne.png diff --git a/include/graphics.h b/include/graphics.h index 927e11b..0e3efe9 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -53,114 +53,114 @@ #define gGfx4lzEpisodeSelectOptions ((u8*)(ROM_START + 0x1946C0)) #define gGfxFromSaveOrBeginning ((u8*)(ROM_START + 0x1954A8)) #define gGfxSaveYesOrNo ((u8*)(ROM_START + 0x1964A8)) -#define gUnknown_08196CA8 ((u8*)(ROM_START + 0x196CA8)) -#define gUnknown_081970DC ((u8*)(ROM_START + 0x1970DC)) -#define gUnknown_08197514 ((u8*)(ROM_START + 0x197514)) -#define gUnknown_08197928 ((u8*)(ROM_START + 0x197928)) -#define gUnknown_08197D18 ((u8*)(ROM_START + 0x197D18)) -#define gUnknown_081981A0 ((u8*)(ROM_START + 0x1981A0)) -#define gUnknown_081985D8 ((u8*)(ROM_START + 0x1985D8)) -#define gUnknown_08198A84 ((u8*)(ROM_START + 0x198A84)) -#define gUnknown_08198E5C ((u8*)(ROM_START + 0x198E5C)) -#define gUnknown_08199228 ((u8*)(ROM_START + 0x199228)) -#define gUnknown_08199690 ((u8*)(ROM_START + 0x199690)) -#define gUnknown_08199AEC ((u8*)(ROM_START + 0x199AEC)) -#define gUnknown_08199EC8 ((u8*)(ROM_START + 0x199EC8)) -#define gUnknown_0819A2E4 ((u8*)(ROM_START + 0x19A2E4)) -#define gUnknown_0819A700 ((u8*)(ROM_START + 0x19A700)) -#define gUnknown_0819ABBC ((u8*)(ROM_START + 0x19ABBC)) -#define gUnknown_0819B028 ((u8*)(ROM_START + 0x19B028)) -#define gUnknown_0819B428 ((u8*)(ROM_START + 0x19B428)) -#define gUnknown_0819B868 ((u8*)(ROM_START + 0x19B868)) -#define gUnknown_0819BCE4 ((u8*)(ROM_START + 0x19BCE4)) -#define gUnknown_0819C0D8 ((u8*)(ROM_START + 0x19C0D8)) -#define gUnknown_0819C434 ((u8*)(ROM_START + 0x19C434)) -#define gUnknown_0819C810 ((u8*)(ROM_START + 0x19C810)) -#define gUnknown_0819CC44 ((u8*)(ROM_START + 0x19CC44)) -#define gUnknown_0819D028 ((u8*)(ROM_START + 0x19D028)) -#define gUnknown_0819D4C8 ((u8*)(ROM_START + 0x19D4C8)) -#define gUnknown_0819D90C ((u8*)(ROM_START + 0x19D90C)) -#define gUnknown_0819DDAC ((u8*)(ROM_START + 0x19DDAC)) -#define gUnknown_0819E18C ((u8*)(ROM_START + 0x19E18C)) -#define gUnknown_0819E5A0 ((u8*)(ROM_START + 0x19E5A0)) -#define gUnknown_0819E9D8 ((u8*)(ROM_START + 0x19E9D8)) -#define gUnknown_0819EDF0 ((u8*)(ROM_START + 0x19EDF0)) -#define gUnknown_0819F208 ((u8*)(ROM_START + 0x19F208)) -#define gUnknown_0819F5C0 ((u8*)(ROM_START + 0x19F5C0)) -#define gUnknown_0819F9E8 ((u8*)(ROM_START + 0x19F9E8)) -#define gUnknown_0819FD84 ((u8*)(ROM_START + 0x19FD84)) -#define gUnknown_081A0120 ((u8*)(ROM_START + 0x1A0120)) -#define gUnknown_081A0580 ((u8*)(ROM_START + 0x1A0580)) -#define gUnknown_081A09E4 ((u8*)(ROM_START + 0x1A09E4)) -#define gUnknown_081A0E58 ((u8*)(ROM_START + 0x1A0E58)) -#define gUnknown_081A1324 ((u8*)(ROM_START + 0x1A1324)) -#define gUnknown_081A1728 ((u8*)(ROM_START + 0x1A1728)) -#define gUnknown_081A1A10 ((u8*)(ROM_START + 0x1A1A10)) -#define gUnknown_081A1E1C ((u8*)(ROM_START + 0x1A1E1C)) -#define gUnknown_081A22A4 ((u8*)(ROM_START + 0x1A22A4)) -#define gUnknown_081A26BC ((u8*)(ROM_START + 0x1A26BC)) -#define gUnknown_081A2AE4 ((u8*)(ROM_START + 0x1A2AE4)) -#define gUnknown_081A2EE4 ((u8*)(ROM_START + 0x1A2EE4)) -#define gUnknown_081A3330 ((u8*)(ROM_START + 0x1A3330)) -#define gUnknown_081A3714 ((u8*)(ROM_START + 0x1A3714)) -#define gUnknown_081A3B44 ((u8*)(ROM_START + 0x1A3B44)) -#define gUnknown_081A3FF8 ((u8*)(ROM_START + 0x1A3FF8)) -#define gUnknown_081A439C ((u8*)(ROM_START + 0x1A439C)) -#define gUnknown_081A47D4 ((u8*)(ROM_START + 0x1A47D4)) -#define gUnknown_081A4BD4 ((u8*)(ROM_START + 0x1A4BD4)) -#define gUnknown_081A4FF0 ((u8*)(ROM_START + 0x1A4FF0)) -#define gUnknown_081A541C ((u8*)(ROM_START + 0x1A541C)) -#define gUnknown_081A5828 ((u8*)(ROM_START + 0x1A5828)) -#define gUnknown_081A5BF4 ((u8*)(ROM_START + 0x1A5BF4)) -#define gUnknown_081A5FA4 ((u8*)(ROM_START + 0x1A5FA4)) -#define gUnknown_081A639C ((u8*)(ROM_START + 0x1A639C)) -#define gUnknown_081A675C ((u8*)(ROM_START + 0x1A675C)) -#define gUnknown_081A6B88 ((u8*)(ROM_START + 0x1A6B88)) -#define gUnknown_081A6F68 ((u8*)(ROM_START + 0x1A6F68)) -#define gUnknown_081A7310 ((u8*)(ROM_START + 0x1A7310)) -#define gUnknown_081A775C ((u8*)(ROM_START + 0x1A775C)) -#define gUnknown_081A7B68 ((u8*)(ROM_START + 0x1A7B68)) -#define gUnknown_081A7FA4 ((u8*)(ROM_START + 0x1A7FA4)) -#define gUnknown_081A83C4 ((u8*)(ROM_START + 0x1A83C4)) -#define gUnknown_081A8828 ((u8*)(ROM_START + 0x1A8828)) -#define gUnknown_081A8C30 ((u8*)(ROM_START + 0x1A8C30)) -#define gUnknown_081A8F4C ((u8*)(ROM_START + 0x1A8F4C)) -#define gUnknown_081A9380 ((u8*)(ROM_START + 0x1A9380)) -#define gUnknown_081A97CC ((u8*)(ROM_START + 0x1A97CC)) -#define gUnknown_081A9BC8 ((u8*)(ROM_START + 0x1A9BC8)) -#define gUnknown_081AA054 ((u8*)(ROM_START + 0x1AA054)) -#define gUnknown_081AA458 ((u8*)(ROM_START + 0x1AA458)) -#define gUnknown_081AA894 ((u8*)(ROM_START + 0x1AA894)) -#define gUnknown_081AACDC ((u8*)(ROM_START + 0x1AACDC)) -#define gUnknown_081AB178 ((u8*)(ROM_START + 0x1AB178)) -#define gUnknown_081AB574 ((u8*)(ROM_START + 0x1AB574)) -#define gUnknown_081AB9FC ((u8*)(ROM_START + 0x1AB9FC)) -#define gUnknown_081ABE00 ((u8*)(ROM_START + 0x1ABE00)) -#define gUnknown_081AC2B0 ((u8*)(ROM_START + 0x1AC2B0)) -#define gUnknown_081AC75C ((u8*)(ROM_START + 0x1AC75C)) -#define gUnknown_081ACBFC ((u8*)(ROM_START + 0x1ACBFC)) -#define gUnknown_081AD02C ((u8*)(ROM_START + 0x1AD02C)) -#define gUnknown_081AD448 ((u8*)(ROM_START + 0x1AD448)) -#define gUnknown_081AD864 ((u8*)(ROM_START + 0x1AD864)) -#define gUnknown_081ADCD4 ((u8*)(ROM_START + 0x1ADCD4)) -#define gUnknown_081AE0DC ((u8*)(ROM_START + 0x1AE0DC)) -#define gUnknown_081AE4FC ((u8*)(ROM_START + 0x1AE4FC)) -#define gUnknown_081AE938 ((u8*)(ROM_START + 0x1AE938)) -#define gUnknown_081AED3C ((u8*)(ROM_START + 0x1AED3C)) -#define gUnknown_081AF15C ((u8*)(ROM_START + 0x1AF15C)) -#define gUnknown_081AF5A8 ((u8*)(ROM_START + 0x1AF5A8)) -#define gUnknown_081AF9DC ((u8*)(ROM_START + 0x1AF9DC)) -#define gUnknown_081AFE0C ((u8*)(ROM_START + 0x1AFE0C)) -#define gUnknown_081B01D0 ((u8*)(ROM_START + 0x1B01D0)) -#define gUnknown_081B0594 ((u8*)(ROM_START + 0x1B0594)) -#define gUnknown_081B0984 ((u8*)(ROM_START + 0x1B0984)) -#define gUnknown_081B0DC4 ((u8*)(ROM_START + 0x1B0DC4)) -#define gUnknown_081B1150 ((u8*)(ROM_START + 0x1B1150)) -#define gUnknown_081B14EC ((u8*)(ROM_START + 0x1B14EC)) -#define gUnknown_081B18C0 ((u8*)(ROM_START + 0x1B18C0)) -#define gUnknown_081B1CBC ((u8*)(ROM_START + 0x1B1CBC)) -#define gUnknown_081B2150 ((u8*)(ROM_START + 0x1B2150)) -#define gUnknown_081B25F0 ((u8*)(ROM_START + 0x1B25F0)) +#define gGfxProfilesMiaFey0_description ((u8*)(ROM_START + 0x196CA8)) +#define gGfxProfilesMayaFey0_description ((u8*)(ROM_START + 0x1970DC)) +#define gGfxProfilesLarryButz0_description ((u8*)(ROM_START + 0x197514)) +#define gGfxProfilesCindyStone_description ((u8*)(ROM_START + 0x197928)) +#define gGfxProfilesFrankSahwit_description ((u8*)(ROM_START + 0x197D18)) +#define gGfxProfilesWinstonPayne_description ((u8*)(ROM_START + 0x1981A0)) +#define gGfxEvidenceGenericAutopsyReport0_description ((u8*)(ROM_START + 0x1985D8)) +#define gGfxEvidenceTheThinker0_description ((u8*)(ROM_START + 0x198A84)) +#define gGfxEvidenceCindyStonesPassport_description ((u8*)(ROM_START + 0x198E5C)) +#define gGfxEvidenceGenericAffidavit0_description ((u8*)(ROM_START + 0x199228)) +#define gGfxProfilesMiaFey1_description ((u8*)(ROM_START + 0x199690)) +#define gGfxProfilesMayaFey1_description ((u8*)(ROM_START + 0x199AEC)) +#define gGfxProfilesMayaFey2_description ((u8*)(ROM_START + 0x199EC8)) +#define gGfxProfilesMayaFey3_description ((u8*)(ROM_START + 0x19A2E4)) +#define gGfxProfilesMilesEdgeworth0_description ((u8*)(ROM_START + 0x19A700)) +#define gGfxProfilesDickGumshoe_description ((u8*)(ROM_START + 0x19ABBC)) +#define gGfxProfilesAprilMay0_description ((u8*)(ROM_START + 0x19B028)) +#define gGfxProfilesAprilMay1_description ((u8*)(ROM_START + 0x19B428)) +#define gGfxProfilesAprilMay2_description ((u8*)(ROM_START + 0x19B868)) +#define gGfxProfilesReddWhite0_description ((u8*)(ROM_START + 0x19BCE4)) +#define gGfxProfilesBellboy0_description ((u8*)(ROM_START + 0x19C0D8)) +#define gGfxProfilesBellboy1_description ((u8*)(ROM_START + 0x19C434)) +#define gGfxProfilesMarvinGrossberg_description ((u8*)(ROM_START + 0x19C810)) +#define gGfxEvidencePhoenixBadge_description ((u8*)(ROM_START + 0x19CC44)) +#define gGfxEvidenceGenericAutopsyReport1_description ((u8*)(ROM_START + 0x19D028)) +#define gGfxEvidenceGenericLetter0_description ((u8*)(ROM_START + 0x19D4C8)) +#define gGfxEvidenceMayasCellphone_description ((u8*)(ROM_START + 0x19D90C)) +#define gGfxEvidenceGlassShards_description ((u8*)(ROM_START + 0x19DDAC)) +#define gGfxEvidenceTheThinker1_description ((u8*)(ROM_START + 0x19E18C)) +#define gGfxEvidenceTheThinker2_description ((u8*)(ROM_START + 0x19E5A0)) +#define gGfxEvidenceMayaMemo_description ((u8*)(ROM_START + 0x19E9D8)) +#define gGfxEvidenceNoteFromTheSafe_description ((u8*)(ROM_START + 0x19EDF0)) +#define gGfxEvidenceWiretap_description ((u8*)(ROM_START + 0x19F208)) +#define gGfxEvidenceGenericAffidavit1_description ((u8*)(ROM_START + 0x19F5C0)) +#define gGfxProfilesMistyFey0_description ((u8*)(ROM_START + 0x19F9E8)) +#define gGfxProfilesReddWhite1_description ((u8*)(ROM_START + 0x19FD84)) +#define gGfxEvidenceGenericNewspaperClipping_description ((u8*)(ROM_START + 0x1A0120)) +#define gGfxEvidenceGenericPhoto0_description ((u8*)(ROM_START + 0x1A0580)) +#define gGfxEvidenceGenericAffidavit2_description ((u8*)(ROM_START + 0x1A09E4)) +#define gGfxEvidenceGenericAutopsyReport2_description ((u8*)(ROM_START + 0x1A0E58)) +#define gGfxEvidenceGenericLetter1_description ((u8*)(ROM_START + 0x1A1324)) +#define gGfxEvidenceLottasCamera0_description ((u8*)(ROM_START + 0x1A1728)) +#define gGfxProfilesWillPowers_description ((u8*)(ROM_START + 0x1A1A10)) +#define gGfxProfilesWendyOldbag_description ((u8*)(ROM_START + 0x1A1E1C)) +#define gGfxProfilesJackHammer_description ((u8*)(ROM_START + 0x1A22A4)) +#define gGfxProfilesPennyNichols_description ((u8*)(ROM_START + 0x1A26BC)) +#define gGfxProfilesSalManella_description ((u8*)(ROM_START + 0x1A2AE4)) +#define gGfxProfilesDeeVasquez_description ((u8*)(ROM_START + 0x1A2EE4)) +#define gGfxProfilesCodyHackins_description ((u8*)(ROM_START + 0x1A3330)) +#define gGfxEvidenceGenericAffidavit3_description ((u8*)(ROM_START + 0x1A3714)) +#define gGfxEvidenceGenericAutopsyReport3_description ((u8*)(ROM_START + 0x1A3B44)) +#define gGfxEvidenceGlobalStudiosCardKey_description ((u8*)(ROM_START + 0x1A3FF8)) +#define gGfxEvidenceGenericPhoto1_description ((u8*)(ROM_START + 0x1A439C)) +#define gGfxEvidenceGenericPhoto2_description ((u8*)(ROM_START + 0x1A47D4)) +#define gGfxEvidenceGenericPhoto3_description ((u8*)(ROM_START + 0x1A4BD4)) +#define gGfxEvidenceSteelSamuraiSpear0_description ((u8*)(ROM_START + 0x1A4FF0)) +#define gGfxEvidenceSteelSamuraiSpear1_description ((u8*)(ROM_START + 0x1A541C)) +#define gGfxEvidenceEmptyBottle0_description ((u8*)(ROM_START + 0x1A5828)) +#define gGfxEvidenceKeyToCottage_description ((u8*)(ROM_START + 0x1A5BF4)) +#define gGfxEvidenceGenericLetter2_description ((u8*)(ROM_START + 0x1A5FA4)) +#define gGfxEvidenceSteelSamuraiScript_description ((u8*)(ROM_START + 0x1A639C)) +#define gGfxEvidenceMrMonkey_description ((u8*)(ROM_START + 0x1A675C)) +#define gGfxEvidenceSteelSamuraiCards_description ((u8*)(ROM_START + 0x1A6B88)) +#define gGfxEvidenceSteelSamuraiUltraRareCard_description ((u8*)(ROM_START + 0x1A6F68)) +#define gGfxEvidenceCodysSteelSamuraiScrapbook_description ((u8*)(ROM_START + 0x1A7310)) +#define gGfxEvidenceCodysDigitalCamera_description ((u8*)(ROM_START + 0x1A775C)) +#define gGfxEvidencePlateWithSteakBones_description ((u8*)(ROM_START + 0x1A7B68)) +#define gGfxEvidenceEmptyBottle1_description ((u8*)(ROM_START + 0x1A7FA4)) +#define gGfxEvidenceGenericPhoto4_description ((u8*)(ROM_START + 0x1A83C4)) +#define gGfxEvidenceGlobalStudiosVan_description ((u8*)(ROM_START + 0x1A8828)) +#define gGfxEvidenceEmptyPlate_description ((u8*)(ROM_START + 0x1A8C30)) +#define gGfxProfilesMilesEdgeworth1_description ((u8*)(ROM_START + 0x1A8F4C)) +#define gGfxProfilesLottaHart0_description ((u8*)(ROM_START + 0x1A9380)) +#define gGfxProfilesLottaHart1_description ((u8*)(ROM_START + 0x1A97CC)) +#define gGfxProfilesLarryButz1_description ((u8*)(ROM_START + 0x1A9BC8)) +#define gGfxProfilesRobertHammond_description ((u8*)(ROM_START + 0x1AA054)) +#define gGfxProfilesMistyFey1_description ((u8*)(ROM_START + 0x1AA458)) +#define gGfxProfilesManfredVonKarma_description ((u8*)(ROM_START + 0x1AA894)) +#define gGfxProfilesGregoryEdgeworth_description ((u8*)(ROM_START + 0x1AACDC)) +#define gGfxProfilesOldMan0_description ((u8*)(ROM_START + 0x1AB178)) +#define gGfxProfilesOldMan1_description ((u8*)(ROM_START + 0x1AB574)) +#define gGfxEvidenceFirecrackers_description ((u8*)(ROM_START + 0x1AB9FC)) +#define gGfxEvidenceGenericAutopsyReport4_description ((u8*)(ROM_START + 0x1ABE00)) +#define gGfxEvidenceGenericAutopsyReport5_description ((u8*)(ROM_START + 0x1AC2B0)) +#define gGfxEvidenceGenericAutopsyReport6_description ((u8*)(ROM_START + 0x1AC75C)) +#define gGfxEvidenceLottasCamera1_description ((u8*)(ROM_START + 0x1ACBFC)) +#define gGfxEvidenceGenericPhoto5_description ((u8*)(ROM_START + 0x1AD02C)) +#define gGfxEvidenceGenericPhoto6_description ((u8*)(ROM_START + 0x1AD448)) +#define gGfxEvidenceGenericPhoto7_description ((u8*)(ROM_START + 0x1AD864)) +#define gGfxProfilesMistyFey2_description ((u8*)(ROM_START + 0x1ADCD4)) +#define gGfxEvidenceArticleGourdy_description ((u8*)(ROM_START + 0x1AE0DC)) +#define gGfxEvidenceGenericAffidavit4_description ((u8*)(ROM_START + 0x1AE4FC)) +#define gGfxEvidenceGenericPhoto8_description ((u8*)(ROM_START + 0x1AE938)) +#define gGfxEvidenceBullet0_description ((u8*)(ROM_START + 0x1AED3C)) +#define gGfxEvidenceBullet1_description ((u8*)(ROM_START + 0x1AF15C)) +#define gGfxEvidencePistol_description ((u8*)(ROM_START + 0x1AF5A8)) +#define gGfxEvidenceGenericAffidavit5_description ((u8*)(ROM_START + 0x1AF9DC)) +#define gGfxEvidenceAirTube_description ((u8*)(ROM_START + 0x1AFE0C)) +#define gGfxEvidenceMissile_description ((u8*)(ROM_START + 0x1B01D0)) +#define gGfxEvidenceFishingPole_description ((u8*)(ROM_START + 0x1B0594)) +#define gGfxEvidenceMetalDetector_description ((u8*)(ROM_START + 0x1B0984)) +#define gGfxEvidencePolly_description ((u8*)(ROM_START + 0x1B0DC4)) +#define gGfxEvidenceYannisSafe_description ((u8*)(ROM_START + 0x1B1150)) +#define gGfxEvidenceGenericAutopsyReport7_description ((u8*)(ROM_START + 0x1B14EC)) +#define gGfxEvidenceGenericPhoto9_description ((u8*)(ROM_START + 0x1B18C0)) +#define gGfxEvidenceGenericLetter3_description ((u8*)(ROM_START + 0x1B1CBC)) +#define gGfxEvidenceDl6Bullet_description ((u8*)(ROM_START + 0x1B2150)) +#define gGfxEvidenceMissileAngry_description ((u8*)(ROM_START + 0x1B25F0)) #define gGfxEvidenceProfilePictures ((u8*)(GFX_BASE_ADDR + 0x3290C)) @@ -469,114 +469,114 @@ extern u8 gPalConfetti[]; extern u8 gGfx4lzEpisodeSelectOptions[]; extern u8 gGfxFromSaveOrBeginning[]; extern u8 gGfxSaveYesOrNo[]; -extern u8 gUnknown_08196CA8[]; -extern u8 gUnknown_081970DC[]; -extern u8 gUnknown_08197514[]; -extern u8 gUnknown_08197928[]; -extern u8 gUnknown_08197D18[]; -extern u8 gUnknown_081981A0[]; -extern u8 gUnknown_081985D8[]; -extern u8 gUnknown_08198A84[]; -extern u8 gUnknown_08198E5C[]; -extern u8 gUnknown_08199228[]; -extern u8 gUnknown_08199690[]; -extern u8 gUnknown_08199AEC[]; -extern u8 gUnknown_08199EC8[]; -extern u8 gUnknown_0819A2E4[]; -extern u8 gUnknown_0819A700[]; -extern u8 gUnknown_0819ABBC[]; -extern u8 gUnknown_0819B028[]; -extern u8 gUnknown_0819B428[]; -extern u8 gUnknown_0819B868[]; -extern u8 gUnknown_0819BCE4[]; -extern u8 gUnknown_0819C0D8[]; -extern u8 gUnknown_0819C434[]; -extern u8 gUnknown_0819C810[]; -extern u8 gUnknown_0819CC44[]; -extern u8 gUnknown_0819D028[]; -extern u8 gUnknown_0819D4C8[]; -extern u8 gUnknown_0819D90C[]; -extern u8 gUnknown_0819DDAC[]; -extern u8 gUnknown_0819E18C[]; -extern u8 gUnknown_0819E5A0[]; -extern u8 gUnknown_0819E9D8[]; -extern u8 gUnknown_0819EDF0[]; -extern u8 gUnknown_0819F208[]; -extern u8 gUnknown_0819F5C0[]; -extern u8 gUnknown_0819F9E8[]; -extern u8 gUnknown_0819FD84[]; -extern u8 gUnknown_081A0120[]; -extern u8 gUnknown_081A0580[]; -extern u8 gUnknown_081A09E4[]; -extern u8 gUnknown_081A0E58[]; -extern u8 gUnknown_081A1324[]; -extern u8 gUnknown_081A1728[]; -extern u8 gUnknown_081A1A10[]; -extern u8 gUnknown_081A1E1C[]; -extern u8 gUnknown_081A22A4[]; -extern u8 gUnknown_081A26BC[]; -extern u8 gUnknown_081A2AE4[]; -extern u8 gUnknown_081A2EE4[]; -extern u8 gUnknown_081A3330[]; -extern u8 gUnknown_081A3714[]; -extern u8 gUnknown_081A3B44[]; -extern u8 gUnknown_081A3FF8[]; -extern u8 gUnknown_081A439C[]; -extern u8 gUnknown_081A47D4[]; -extern u8 gUnknown_081A4BD4[]; -extern u8 gUnknown_081A4FF0[]; -extern u8 gUnknown_081A541C[]; -extern u8 gUnknown_081A5828[]; -extern u8 gUnknown_081A5BF4[]; -extern u8 gUnknown_081A5FA4[]; -extern u8 gUnknown_081A639C[]; -extern u8 gUnknown_081A675C[]; -extern u8 gUnknown_081A6B88[]; -extern u8 gUnknown_081A6F68[]; -extern u8 gUnknown_081A7310[]; -extern u8 gUnknown_081A775C[]; -extern u8 gUnknown_081A7B68[]; -extern u8 gUnknown_081A7FA4[]; -extern u8 gUnknown_081A83C4[]; -extern u8 gUnknown_081A8828[]; -extern u8 gUnknown_081A8C30[]; -extern u8 gUnknown_081A8F4C[]; -extern u8 gUnknown_081A9380[]; -extern u8 gUnknown_081A97CC[]; -extern u8 gUnknown_081A9BC8[]; -extern u8 gUnknown_081AA054[]; -extern u8 gUnknown_081AA458[]; -extern u8 gUnknown_081AA894[]; -extern u8 gUnknown_081AACDC[]; -extern u8 gUnknown_081AB178[]; -extern u8 gUnknown_081AB574[]; -extern u8 gUnknown_081AB9FC[]; -extern u8 gUnknown_081ABE00[]; -extern u8 gUnknown_081AC2B0[]; -extern u8 gUnknown_081AC75C[]; -extern u8 gUnknown_081ACBFC[]; -extern u8 gUnknown_081AD02C[]; -extern u8 gUnknown_081AD448[]; -extern u8 gUnknown_081AD864[]; -extern u8 gUnknown_081ADCD4[]; -extern u8 gUnknown_081AE0DC[]; -extern u8 gUnknown_081AE4FC[]; -extern u8 gUnknown_081AE938[]; -extern u8 gUnknown_081AED3C[]; -extern u8 gUnknown_081AF15C[]; -extern u8 gUnknown_081AF5A8[]; -extern u8 gUnknown_081AF9DC[]; -extern u8 gUnknown_081AFE0C[]; -extern u8 gUnknown_081B01D0[]; -extern u8 gUnknown_081B0594[]; -extern u8 gUnknown_081B0984[]; -extern u8 gUnknown_081B0DC4[]; -extern u8 gUnknown_081B1150[]; -extern u8 gUnknown_081B14EC[]; -extern u8 gUnknown_081B18C0[]; -extern u8 gUnknown_081B1CBC[]; -extern u8 gUnknown_081B2150[]; -extern u8 gUnknown_081B25F0[]; +extern u8 gGfxProfilesMiaFey0_description[]; +extern u8 gGfxProfilesMayaFey0_description[]; +extern u8 gGfxProfilesLarryButz0_description[]; +extern u8 gGfxProfilesCindyStone_description[]; +extern u8 gGfxProfilesFrankSahwit_description[]; +extern u8 gGfxProfilesWinstonPayne_description[]; +extern u8 gGfxEvidenceGenericAutopsyReport0_description[]; +extern u8 gGfxEvidenceTheThinker0_description[]; +extern u8 gGfxEvidenceCindyStonesPassport_description[]; +extern u8 gGfxEvidenceGenericAffidavit0_description[]; +extern u8 gGfxProfilesMiaFey1_description[]; +extern u8 gGfxProfilesMayaFey1_description[]; +extern u8 gGfxProfilesMayaFey2_description[]; +extern u8 gGfxProfilesMayaFey3_description[]; +extern u8 gGfxProfilesMilesEdgeworth0_description[]; +extern u8 gGfxProfilesDickGumshoe_description[]; +extern u8 gGfxProfilesAprilMay0_description[]; +extern u8 gGfxProfilesAprilMay1_description[]; +extern u8 gGfxProfilesAprilMay2_description[]; +extern u8 gGfxProfilesReddWhite0_description[]; +extern u8 gGfxProfilesBellboy0_description[]; +extern u8 gGfxProfilesBellboy1_description[]; +extern u8 gGfxProfilesMarvinGrossberg_description[]; +extern u8 gGfxEvidencePhoenixBadge_description[]; +extern u8 gGfxEvidenceGenericAutopsyReport1_description[]; +extern u8 gGfxEvidenceGenericLetter0_description[]; +extern u8 gGfxEvidenceMayasCellphone_description[]; +extern u8 gGfxEvidenceGlassShards_description[]; +extern u8 gGfxEvidenceTheThinker1_description[]; +extern u8 gGfxEvidenceTheThinker2_description[]; +extern u8 gGfxEvidenceMayaMemo_description[]; +extern u8 gGfxEvidenceNoteFromTheSafe_description[]; +extern u8 gGfxEvidenceWiretap_description[]; +extern u8 gGfxEvidenceGenericAffidavit1_description[]; +extern u8 gGfxProfilesMistyFey0_description[]; +extern u8 gGfxProfilesReddWhite1_description[]; +extern u8 gGfxEvidenceGenericNewspaperClipping_description[]; +extern u8 gGfxEvidenceGenericPhoto0_description[]; +extern u8 gGfxEvidenceGenericAffidavit2_description[]; +extern u8 gGfxEvidenceGenericAutopsyReport2_description[]; +extern u8 gGfxEvidenceGenericLetter1_description[]; +extern u8 gGfxEvidenceLottasCamera0_description[]; +extern u8 gGfxProfilesWillPowers_description[]; +extern u8 gGfxProfilesWendyOldbag_description[]; +extern u8 gGfxProfilesJackHammer_description[]; +extern u8 gGfxProfilesPennyNichols_description[]; +extern u8 gGfxProfilesSalManella_description[]; +extern u8 gGfxProfilesDeeVasquez_description[]; +extern u8 gGfxProfilesCodyHackins_description[]; +extern u8 gGfxEvidenceGenericAffidavit3_description[]; +extern u8 gGfxEvidenceGenericAutopsyReport3_description[]; +extern u8 gGfxEvidenceGlobalStudiosCardKey_description[]; +extern u8 gGfxEvidenceGenericPhoto1_description[]; +extern u8 gGfxEvidenceGenericPhoto2_description[]; +extern u8 gGfxEvidenceGenericPhoto3_description[]; +extern u8 gGfxEvidenceSteelSamuraiSpear0_description[]; +extern u8 gGfxEvidenceSteelSamuraiSpear1_description[]; +extern u8 gGfxEvidenceEmptyBottle0_description[]; +extern u8 gGfxEvidenceKeyToCottage_description[]; +extern u8 gGfxEvidenceGenericLetter2_description[]; +extern u8 gGfxEvidenceSteelSamuraiScript_description[]; +extern u8 gGfxEvidenceMrMonkey_description[]; +extern u8 gGfxEvidenceSteelSamuraiCards_description[]; +extern u8 gGfxEvidenceSteelSamuraiUltraRareCard_description[]; +extern u8 gGfxEvidenceCodysSteelSamuraiScrapbook_description[]; +extern u8 gGfxEvidenceCodysDigitalCamera_description[]; +extern u8 gGfxEvidencePlateWithSteakBones_description[]; +extern u8 gGfxEvidenceEmptyBottle1_description[]; +extern u8 gGfxEvidenceGenericPhoto4_description[]; +extern u8 gGfxEvidenceGlobalStudiosVan_description[]; +extern u8 gGfxEvidenceEmptyPlate_description[]; +extern u8 gGfxProfilesMilesEdgeworth1_description[]; +extern u8 gGfxProfilesLottaHart0_description[]; +extern u8 gGfxProfilesLottaHart1_description[]; +extern u8 gGfxProfilesLarryButz1_description[]; +extern u8 gGfxProfilesRobertHammond_description[]; +extern u8 gGfxProfilesMistyFey1_description[]; +extern u8 gGfxProfilesManfredVonKarma_description[]; +extern u8 gGfxProfilesGregoryEdgeworth_description[]; +extern u8 gGfxProfilesOldMan0_description[]; +extern u8 gGfxProfilesOldMan1_description[]; +extern u8 gGfxEvidenceFirecrackers_description[]; +extern u8 gGfxEvidenceGenericAutopsyReport4_description[]; +extern u8 gGfxEvidenceGenericAutopsyReport5_description[]; +extern u8 gGfxEvidenceGenericAutopsyReport6_description[]; +extern u8 gGfxEvidenceLottasCamera1_description[]; +extern u8 gGfxEvidenceGenericPhoto5_description[]; +extern u8 gGfxEvidenceGenericPhoto6_description[]; +extern u8 gGfxEvidenceGenericPhoto7_description[]; +extern u8 gGfxProfilesMistyFey2_description[]; +extern u8 gGfxEvidenceArticleGourdy_description[]; +extern u8 gGfxEvidenceGenericAffidavit4_description[]; +extern u8 gGfxEvidenceGenericPhoto8_description[]; +extern u8 gGfxEvidenceBullet0_description[]; +extern u8 gGfxEvidenceBullet1_description[]; +extern u8 gGfxEvidencePistol_description[]; +extern u8 gGfxEvidenceGenericAffidavit5_description[]; +extern u8 gGfxEvidenceAirTube_description[]; +extern u8 gGfxEvidenceMissile_description[]; +extern u8 gGfxEvidenceFishingPole_description[]; +extern u8 gGfxEvidenceMetalDetector_description[]; +extern u8 gGfxEvidencePolly_description[]; +extern u8 gGfxEvidenceYannisSafe_description[]; +extern u8 gGfxEvidenceGenericAutopsyReport7_description[]; +extern u8 gGfxEvidenceGenericPhoto9_description[]; +extern u8 gGfxEvidenceGenericLetter3_description[]; +extern u8 gGfxEvidenceDl6Bullet_description[]; +extern u8 gGfxEvidenceMissileAngry_description[]; extern u8 gGfxEvidenceProfilePictures[]; extern u8 gPalEvidenceEmptyPlate[]; extern u8 gGfxEvidenceEmptyPlate[]; diff --git a/src/court_record.c b/src/court_record.c index ce326b0..28eabb6 100644 --- a/src/court_record.c +++ b/src/court_record.c @@ -26,542 +26,542 @@ struct EvidenceProfileData const struct EvidenceProfileData gEvidenceProfileData[] = { { - .descriptionTiles = gUnknown_08196CA8, + .descriptionTiles = gGfxProfilesMiaFey0_description, .evidenceImageId = 18, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081970DC, + .descriptionTiles = gGfxProfilesMayaFey0_description, .evidenceImageId = 23, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_08197514, + .descriptionTiles = gGfxProfilesLarryButz0_description, .evidenceImageId = 19, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_08197928, + .descriptionTiles = gGfxProfilesCindyStone_description, .evidenceImageId = 20, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_08197D18, + .descriptionTiles = gGfxProfilesFrankSahwit_description, .evidenceImageId = 21, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081981A0, + .descriptionTiles = gGfxProfilesWinstonPayne_description, .evidenceImageId = 22, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081985D8, + .descriptionTiles = gGfxEvidenceGenericAutopsyReport0_description, .evidenceImageId = 16, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_08198A84, + .descriptionTiles = gGfxEvidenceTheThinker0_description, .evidenceImageId = 14, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_08198E5C, + .descriptionTiles = gGfxEvidenceCindyStonesPassport_description, .evidenceImageId = 15, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_08199228, + .descriptionTiles = gGfxEvidenceGenericAffidavit0_description, .evidenceImageId = 17, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_08199690, + .descriptionTiles = gGfxProfilesMiaFey1_description, .evidenceImageId = 18, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_08199AEC, + .descriptionTiles = gGfxProfilesMayaFey1_description, .evidenceImageId = 23, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_08199EC8, + .descriptionTiles = gGfxProfilesMayaFey2_description, .evidenceImageId = 23, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_0819A2E4, + .descriptionTiles = gGfxProfilesMayaFey3_description, .evidenceImageId = 23, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_0819A700, + .descriptionTiles = gGfxProfilesMilesEdgeworth0_description, .evidenceImageId = 30, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_0819ABBC, + .descriptionTiles = gGfxProfilesDickGumshoe_description, .evidenceImageId = 10, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_0819B028, + .descriptionTiles = gGfxProfilesAprilMay0_description, .evidenceImageId = 11, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_0819B428, + .descriptionTiles = gGfxProfilesAprilMay1_description, .evidenceImageId = 11, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_0819B868, + .descriptionTiles = gGfxProfilesAprilMay2_description, .evidenceImageId = 11, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_0819BCE4, + .descriptionTiles = gGfxProfilesReddWhite0_description, .evidenceImageId = 13, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_0819C0D8, + .descriptionTiles = gGfxProfilesBellboy0_description, .evidenceImageId = 12, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_0819C434, + .descriptionTiles = gGfxProfilesBellboy1_description, .evidenceImageId = 12, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_0819C810, + .descriptionTiles = gGfxProfilesMarvinGrossberg_description, .evidenceImageId = 29, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_0819CC44, + .descriptionTiles = gGfxEvidencePhoenixBadge_description, .evidenceImageId = 6, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_0819D028, + .descriptionTiles = gGfxEvidenceGenericAutopsyReport1_description, .evidenceImageId = 16, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_0819D4C8, + .descriptionTiles = gGfxEvidenceGenericLetter0_description, .evidenceImageId = 7, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_0819D90C, + .descriptionTiles = gGfxEvidenceMayasCellphone_description, .evidenceImageId = 3, .evidenceDetailId = 2, }, { - .descriptionTiles = gUnknown_0819DDAC, + .descriptionTiles = gGfxEvidenceGlassShards_description, .evidenceImageId = 26, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_0819E18C, + .descriptionTiles = gGfxEvidenceTheThinker1_description, .evidenceImageId = 14, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_0819E5A0, + .descriptionTiles = gGfxEvidenceTheThinker2_description, .evidenceImageId = 14, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_0819E9D8, + .descriptionTiles = gGfxEvidenceMayaMemo_description, .evidenceImageId = 24, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_0819EDF0, + .descriptionTiles = gGfxEvidenceNoteFromTheSafe_description, .evidenceImageId = 8, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_0819F208, + .descriptionTiles = gGfxEvidenceWiretap_description, .evidenceImageId = 2, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_0819F5C0, + .descriptionTiles = gGfxEvidenceGenericAffidavit1_description, .evidenceImageId = 17, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_0819F9E8, + .descriptionTiles = gGfxProfilesMistyFey0_description, .evidenceImageId = 28, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_0819FD84, + .descriptionTiles = gGfxProfilesReddWhite1_description, .evidenceImageId = 13, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081A0120, + .descriptionTiles = gGfxEvidenceGenericNewspaperClipping_description, .evidenceImageId = 27, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081A0580, + .descriptionTiles = gGfxEvidenceGenericPhoto0_description, .evidenceImageId = 9, .evidenceDetailId = 1, }, { - .descriptionTiles = gUnknown_081A09E4, + .descriptionTiles = gGfxEvidenceGenericAffidavit2_description, .evidenceImageId = 17, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081A0E58, + .descriptionTiles = gGfxEvidenceGenericAutopsyReport2_description, .evidenceImageId = 16, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081A1324, + .descriptionTiles = gGfxEvidenceGenericLetter1_description, .evidenceImageId = 7, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081A1728, + .descriptionTiles = gGfxEvidenceLottasCamera0_description, .evidenceImageId = 1, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081A1A10, + .descriptionTiles = gGfxProfilesWillPowers_description, .evidenceImageId = 43, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081A1E1C, + .descriptionTiles = gGfxProfilesWendyOldbag_description, .evidenceImageId = 48, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081A22A4, + .descriptionTiles = gGfxProfilesJackHammer_description, .evidenceImageId = 47, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081A26BC, + .descriptionTiles = gGfxProfilesPennyNichols_description, .evidenceImageId = 45, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081A2AE4, + .descriptionTiles = gGfxProfilesSalManella_description, .evidenceImageId = 46, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081A2EE4, + .descriptionTiles = gGfxProfilesDeeVasquez_description, .evidenceImageId = 44, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081A3330, + .descriptionTiles = gGfxProfilesCodyHackins_description, .evidenceImageId = 42, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081A3714, + .descriptionTiles = gGfxEvidenceGenericAffidavit3_description, .evidenceImageId = 17, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081A3B44, + .descriptionTiles = gGfxEvidenceGenericAutopsyReport3_description, .evidenceImageId = 16, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081A3FF8, + .descriptionTiles = gGfxEvidenceGlobalStudiosCardKey_description, .evidenceImageId = 37, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081A439C, + .descriptionTiles = gGfxEvidenceGenericPhoto1_description, .evidenceImageId = 9, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081A47D4, + .descriptionTiles = gGfxEvidenceGenericPhoto2_description, .evidenceImageId = 9, .evidenceDetailId = 3, }, { - .descriptionTiles = gUnknown_081A4BD4, + .descriptionTiles = gGfxEvidenceGenericPhoto3_description, .evidenceImageId = 9, .evidenceDetailId = 4, }, { - .descriptionTiles = gUnknown_081A4FF0, + .descriptionTiles = gGfxEvidenceSteelSamuraiSpear0_description, .evidenceImageId = 25, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081A541C, + .descriptionTiles = gGfxEvidenceSteelSamuraiSpear1_description, .evidenceImageId = 25, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081A5828, + .descriptionTiles = gGfxEvidenceEmptyBottle0_description, .evidenceImageId = 33, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081A5BF4, + .descriptionTiles = gGfxEvidenceKeyToCottage_description, .evidenceImageId = 38, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081A5FA4, + .descriptionTiles = gGfxEvidenceGenericLetter2_description, .evidenceImageId = 7, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081A639C, + .descriptionTiles = gGfxEvidenceSteelSamuraiScript_description, .evidenceImageId = 34, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081A675C, + .descriptionTiles = gGfxEvidenceMrMonkey_description, .evidenceImageId = 39, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081A6B88, + .descriptionTiles = gGfxEvidenceSteelSamuraiCards_description, .evidenceImageId = 31, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081A6F68, + .descriptionTiles = gGfxEvidenceSteelSamuraiUltraRareCard_description, .evidenceImageId = 32, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081A7310, + .descriptionTiles = gGfxEvidenceCodysSteelSamuraiScrapbook_description, .evidenceImageId = 40, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081A775C, + .descriptionTiles = gGfxEvidenceCodysDigitalCamera_description, .evidenceImageId = 35, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081A7B68, + .descriptionTiles = gGfxEvidencePlateWithSteakBones_description, .evidenceImageId = 36, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081A7FA4, + .descriptionTiles = gGfxEvidenceEmptyBottle1_description, .evidenceImageId = 33, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081A83C4, + .descriptionTiles = gGfxEvidenceGenericPhoto4_description, .evidenceImageId = 9, .evidenceDetailId = 5, }, { - .descriptionTiles = gUnknown_081A8828, + .descriptionTiles = gGfxEvidenceGlobalStudiosVan_description, .evidenceImageId = 41, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081A8C30, + .descriptionTiles = gGfxEvidenceEmptyPlate_description, .evidenceImageId = 0, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081A8F4C, + .descriptionTiles = gGfxProfilesMilesEdgeworth1_description, .evidenceImageId = 30, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081A9380, + .descriptionTiles = gGfxProfilesLottaHart0_description, .evidenceImageId = 58, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081A97CC, + .descriptionTiles = gGfxProfilesLottaHart1_description, .evidenceImageId = 58, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081A9BC8, + .descriptionTiles = gGfxProfilesLarryButz1_description, .evidenceImageId = 19, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081AA054, + .descriptionTiles = gGfxProfilesRobertHammond_description, .evidenceImageId = 61, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081AA458, + .descriptionTiles = gGfxProfilesMistyFey1_description, .evidenceImageId = 28, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081AA894, + .descriptionTiles = gGfxProfilesManfredVonKarma_description, .evidenceImageId = 59, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081AACDC, + .descriptionTiles = gGfxProfilesGregoryEdgeworth_description, .evidenceImageId = 60, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081AB178, + .descriptionTiles = gGfxProfilesOldMan0_description, .evidenceImageId = 62, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081AB574, + .descriptionTiles = gGfxProfilesOldMan1_description, .evidenceImageId = 62, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081AB9FC, + .descriptionTiles = gGfxEvidenceFirecrackers_description, .evidenceImageId = 49, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081ABE00, + .descriptionTiles = gGfxEvidenceGenericAutopsyReport4_description, .evidenceImageId = 16, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081AC2B0, + .descriptionTiles = gGfxEvidenceGenericAutopsyReport5_description, .evidenceImageId = 16, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081AC75C, + .descriptionTiles = gGfxEvidenceGenericAutopsyReport6_description, .evidenceImageId = 16, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081ACBFC, + .descriptionTiles = gGfxEvidenceLottasCamera1_description, .evidenceImageId = 1, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081AD02C, + .descriptionTiles = gGfxEvidenceGenericPhoto5_description, .evidenceImageId = 9, .evidenceDetailId = 6, }, { - .descriptionTiles = gUnknown_081AD448, + .descriptionTiles = gGfxEvidenceGenericPhoto6_description, .evidenceImageId = 9, .evidenceDetailId = 7, }, { - .descriptionTiles = gUnknown_081AD864, + .descriptionTiles = gGfxEvidenceGenericPhoto7_description, .evidenceImageId = 9, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081ADCD4, + .descriptionTiles = gGfxProfilesMistyFey2_description, .evidenceImageId = 28, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081AE0DC, + .descriptionTiles = gGfxEvidenceArticleGourdy_description, .evidenceImageId = 4, .evidenceDetailId = 11, }, { - .descriptionTiles = gUnknown_081AE4FC, + .descriptionTiles = gGfxEvidenceGenericAffidavit4_description, .evidenceImageId = 17, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081AE938, + .descriptionTiles = gGfxEvidenceGenericPhoto8_description, .evidenceImageId = 9, .evidenceDetailId = 8, }, { - .descriptionTiles = gUnknown_081AED3C, + .descriptionTiles = gGfxEvidenceBullet0_description, .evidenceImageId = 5, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081AF15C, + .descriptionTiles = gGfxEvidenceBullet1_description, .evidenceImageId = 5, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081AF5A8, + .descriptionTiles = gGfxEvidencePistol_description, .evidenceImageId = 50, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081AF9DC, + .descriptionTiles = gGfxEvidenceGenericAffidavit5_description, .evidenceImageId = 17, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081AFE0C, + .descriptionTiles = gGfxEvidenceAirTube_description, .evidenceImageId = 51, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081B01D0, + .descriptionTiles = gGfxEvidenceMissile_description, .evidenceImageId = 53, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081B0594, + .descriptionTiles = gGfxEvidenceFishingPole_description, .evidenceImageId = 56, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081B0984, + .descriptionTiles = gGfxEvidenceMetalDetector_description, .evidenceImageId = 52, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081B0DC4, + .descriptionTiles = gGfxEvidencePolly_description, .evidenceImageId = 57, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081B1150, + .descriptionTiles = gGfxEvidenceYannisSafe_description, .evidenceImageId = 63, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081B14EC, + .descriptionTiles = gGfxEvidenceGenericAutopsyReport7_description, .evidenceImageId = 16, .evidenceDetailId = 9, }, { - .descriptionTiles = gUnknown_081B18C0, + .descriptionTiles = gGfxEvidenceGenericPhoto9_description, .evidenceImageId = 9, .evidenceDetailId = 10, }, { - .descriptionTiles = gUnknown_081B1CBC, + .descriptionTiles = gGfxEvidenceGenericLetter3_description, .evidenceImageId = 7, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081B2150, + .descriptionTiles = gGfxEvidenceDl6Bullet_description, .evidenceImageId = 55, .evidenceDetailId = 0, }, { - .descriptionTiles = gUnknown_081B25F0, + .descriptionTiles = gGfxEvidenceMissileAngry_description, .evidenceImageId = 54, .evidenceDetailId = 0, }, From 07ea27ec7926d675b9ba9b00073e29f008ecfff2 Mon Sep 17 00:00:00 2001 From: Missingmew Date: Fri, 1 Sep 2023 22:40:43 +0200 Subject: [PATCH 07/17] more replacement --- data/graphics.s | 12 +++--------- .../{unk_186540.png => save_game_tiles.png} | Bin include/graphics.h | 4 ++-- src/court.c | 2 +- src/episode_load_processes.c | 6 +++--- src/investigation.c | 2 +- src/save_processes.c | 2 +- 7 files changed, 11 insertions(+), 17 deletions(-) rename graphics/ui/message_box/{unk_186540.png => save_game_tiles.png} (100%) diff --git a/data/graphics.s b/data/graphics.s index fa6f24c..d857702 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -25,9 +25,9 @@ gUnusedAsciiCharSet: gPalEvidenceProfileDesc: .incbin "graphics/evidence_profile_descriptions/evidence_profile_descriptions.gbapal" - .global gUnknown_08186540 -gUnknown_08186540: - .incbin "graphics/ui/message_box/unk_186540.4bpp" + .global gGfxSaveGameTiles +gGfxSaveGameTiles: + .incbin "graphics/ui/message_box/save_game_tiles.4bpp" .global gGfx4bppNametags gGfx4bppNametags: @@ -1704,12 +1704,6 @@ gGfx_BG067_CourtroomBackground: gGfx_BG068_CapcomScreen: .incbin "graphics/striped_images/capcom_screen.4bpp.striped" -@ ; this entry here spills over into an explicitly referenced one (the next), why though... -@ .global gGfx_BG069_SteelSamuraiNight - -@ ; it looks like this reference skips the "table" of this striped image and directly goes to the data? -@ .global gUnknown_083698B8 - .global gGfx_BG069_SteelSamuraiNight gGfx_BG069_SteelSamuraiNight: .incbin "graphics/striped_images/steel_samurai_night.4bpp.striped" diff --git a/graphics/ui/message_box/unk_186540.png b/graphics/ui/message_box/save_game_tiles.png similarity index 100% rename from graphics/ui/message_box/unk_186540.png rename to graphics/ui/message_box/save_game_tiles.png diff --git a/include/graphics.h b/include/graphics.h index 0e3efe9..7395950 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -15,7 +15,7 @@ #define gGfx8lzTitleScreenDemo ((u8*)(ROM_START + 0x182F08)) #define gUnusedAsciiCharSet ((u8*)(ROM_START + 0x185D20)) #define gPalEvidenceProfileDesc ((u8*)(GFX_BASE_ADDR + 0x6520)) -#define gUnknown_08186540 ((u8*)(ROM_START + 0x186540)) +#define gGfxSaveGameTiles ((u8*)(ROM_START + 0x186540)) #define gGfx4bppNametags ((u8*)(ROM_START + 0x187540)) #define gGfx4bppTestimonyArrows ((u8*)(GFX_BASE_ADDR + 0xBD40)) #define gGfx4bppTrialLife ((u8*)(GFX_BASE_ADDR + 0xC040)) @@ -431,7 +431,7 @@ extern u8 gPalTitleScreenDemo[]; extern u8 gGfx8lzTitleScreenDemo[]; extern u8 gUnusedAsciiCharSet[]; extern u8 gPalEvidenceProfileDesc[]; -extern u8 gUnknown_08186540[]; +extern u8 gGfxSaveGameTiles[]; extern u8 gGfx4bppNametags[]; extern u8 gGfx4bppTestimonyArrows[]; extern u8 gGfx4bppTrialLife[]; diff --git a/src/court.c b/src/court.c index 7f4fe89..0ba2d14 100644 --- a/src/court.c +++ b/src/court.c @@ -72,7 +72,7 @@ void CourtInit(struct Main * main) ioRegs->lcd_bg2cnt = BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(30) | BGCNT_16COLOR | BGCNT_WRAP | BGCNT_TXT256x256; ioRegs->lcd_bg3cnt = BGCNT_PRIORITY(3) | BGCNT_CHARBASE(1) | BGCNT_SCREENBASE(31) | BGCNT_MOSAIC | BGCNT_256COLOR | BGCNT_WRAP | BGCNT_TXT256x256; DmaCopy16(3, gUnusedAsciiCharSet, VRAM + 0x3800, 0x800); - DmaCopy16(3, gUnknown_08186540, VRAM, 0x1000); + DmaCopy16(3, gGfxSaveGameTiles, VRAM, 0x1000); DmaCopy16(3, &gPalInvestigationExamineCursors[0], OBJ_PLTT+0x100, 0x20); DmaCopy16(3, gGfx4bppTrialLife, OBJ_VRAM0 + 0x3780, 0x80); DmaCopy16(3, gPalCrossExaminationUI, OBJ_PLTT+0x60, 0x20); diff --git a/src/episode_load_processes.c b/src/episode_load_processes.c index f41dff8..539a1a5 100644 --- a/src/episode_load_processes.c +++ b/src/episode_load_processes.c @@ -25,7 +25,7 @@ void EpisodeLoadGfx(struct Main * main) LZ77UnCompWram(gGfx4lzEpisodeSelectOptions, eBGDecompBuffer); DmaCopy16(3, eBGDecompBuffer, OBJ_VRAM0+0x3400, 0x2800); DmaCopy16(3, gPalChoiceSelected, OBJ_PLTT+0x120, 0x40); - DmaCopy16(3, gUnknown_08186540, VRAM, 0x1000); + DmaCopy16(3, gGfxSaveGameTiles, VRAM, 0x1000); DecompressBackgroundIntoBuffer(0x43); CopyBGDataToVram(0x43); gMain.animationFlags &= ~3; @@ -610,7 +610,7 @@ void ContinueSaveProcess(struct Main * main) { if (main->blendMode == 0) { main->saveContinueFlags = gSaveDataBuffer.main.saveContinueFlags; main->scenarioIdx = gSaveDataBuffer.main.scenarioIdx; - DmaCopy16(3, gUnknown_08186540, BG_CHAR_ADDR(0), 0x1000); + DmaCopy16(3, gGfxSaveGameTiles, BG_CHAR_ADDR(0), 0x1000); DmaCopy16(3, gGfxFromSaveOrBeginning, OBJ_VRAM0 + 0x3400, 0x1000); DmaCopy16(3, gPalChoiceSelected, OBJ_PLTT + 0x120, 0x40); DecompressBackgroundIntoBuffer(0x43); @@ -727,7 +727,7 @@ void ContinueSaveProcess(struct Main * main) { ResetSoundControl(); LoadCurrentScriptIntoRam(); DmaCopy16(3, gUnusedAsciiCharSet, BG_VRAM + 0x3800, 0x800); - DmaCopy16(3, gUnknown_08186540, BG_VRAM, 0x1000); + DmaCopy16(3, gGfxSaveGameTiles, BG_VRAM, 0x1000); i = (uintptr_t)GetBGPalettePtr(0); // ! BAD FAKEMATCH? DmaCopy16(3, i, BG_PLTT, 0x200); DmaCopy16(3, &gSaveDataBuffer.main, &gMain, sizeof(gMain)); diff --git a/src/investigation.c b/src/investigation.c index ee84f93..074afee 100644 --- a/src/investigation.c +++ b/src/investigation.c @@ -68,7 +68,7 @@ void InvestigationInit(struct Main * main, struct InvestigationStruct * investig ioRegs->lcd_bg2cnt = BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(30) | BGCNT_16COLOR | BGCNT_WRAP | BGCNT_TXT256x256; ioRegs->lcd_bg3cnt = BGCNT_PRIORITY(3) | BGCNT_CHARBASE(1) | BGCNT_SCREENBASE(31) | BGCNT_MOSAIC | BGCNT_256COLOR | BGCNT_WRAP | BGCNT_TXT256x256; DmaCopy16(3, gUnusedAsciiCharSet, VRAM + 0x3800, 0x800); - DmaCopy16(3, gUnknown_08186540, VRAM, 0x1000); + DmaCopy16(3, gGfxSaveGameTiles, VRAM, 0x1000); DmaCopy16(3, gGfx4bppInvestigationActions, OBJ_VRAM0 + 0x2000, 0x1000); DmaCopy16(3, gPalActionButtons, OBJ_PLTT+0xA0, 0x40); DmaCopy16(3, gGfx4bppInvestigationScrollButton, OBJ_VRAM0 + 0x3000, 0x200); diff --git a/src/save_processes.c b/src/save_processes.c index 4eca34f..3a97b97 100644 --- a/src/save_processes.c +++ b/src/save_processes.c @@ -105,7 +105,7 @@ void ClearSaveProcess(struct Main *main) case 0: DmaCopy16(3, gUnusedAsciiCharSet, VRAM + 0x3800, 0x800); DmaCopy16(3, GetBGPalettePtr(0), PLTT, BG_PLTT_SIZE); - DmaCopy16(3, gUnknown_08186540, VRAM, 0x1000); + DmaCopy16(3, gGfxSaveGameTiles, VRAM, 0x1000); DmaCopy16(3, gGfxSaveYesOrNo, OBJ_VRAM0 + 0x3C00, 0x800); DmaCopy16(3, gPalChoiceSelected, OBJ_PLTT + 0x120, 0x40); DmaCopy16(3, gTextPal, OBJ_PLTT, 0x20); From 7e4bb4e479429de49c46457c6324e0ac7521c993 Mon Sep 17 00:00:00 2001 From: Missingmew Date: Fri, 1 Sep 2023 22:55:37 +0200 Subject: [PATCH 08/17] get rid of unused labels --- data/graphics.s | 256 --------------------------------------------- include/graphics.h | 130 +---------------------- 2 files changed, 2 insertions(+), 384 deletions(-) diff --git a/data/graphics.s b/data/graphics.s index d857702..224f571 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -649,516 +649,260 @@ gGfxEvidenceMissileAngry_description: .global gGfxEvidenceProfilePictures gGfxEvidenceProfilePictures: - .global gPalEvidenceEmptyPlate -gPalEvidenceEmptyPlate: .incbin "graphics/evidence_profile_pictures/evidence/empty_plate.gbapal" - .global gGfxEvidenceEmptyPlate -gGfxEvidenceEmptyPlate: .incbin "graphics/evidence_profile_pictures/evidence/empty_plate.4bpp" - .global gPalEvidenceLottasCamera -gPalEvidenceLottasCamera: .incbin "graphics/evidence_profile_pictures/evidence/lottas_camera.gbapal" - .global gGfxEvidenceLottasCamera -gGfxEvidenceLottasCamera: .incbin "graphics/evidence_profile_pictures/evidence/lottas_camera.4bpp" - .global gPalEvidenceWiretap -gPalEvidenceWiretap: .incbin "graphics/evidence_profile_pictures/evidence/wiretap.gbapal" - .global gGfxEvidenceWiretap -gGfxEvidenceWiretap: .incbin "graphics/evidence_profile_pictures/evidence/wiretap.4bpp" - .global gPalEvidenceMayasCellphone -gPalEvidenceMayasCellphone: .incbin "graphics/evidence_profile_pictures/evidence/mayas_cellphone.gbapal" - .global gGfxEvidenceMayasCellphone -gGfxEvidenceMayasCellphone: .incbin "graphics/evidence_profile_pictures/evidence/mayas_cellphone.4bpp" - .global gPalEvidenceArticleGourdy -gPalEvidenceArticleGourdy: .incbin "graphics/evidence_profile_pictures/evidence/article_gourdy.gbapal" - .global gGfxEvidenceArticleGourdy -gGfxEvidenceArticleGourdy: .incbin "graphics/evidence_profile_pictures/evidence/article_gourdy.4bpp" - .global gPalEvidenceBullet -gPalEvidenceBullet: .incbin "graphics/evidence_profile_pictures/evidence/bullet.gbapal" - .global gGfxEvidenceBullet -gGfxEvidenceBullet: .incbin "graphics/evidence_profile_pictures/evidence/bullet.4bpp" - .global gUnknown_081B59CC_pal -gUnknown_081B59CC_pal: .incbin "graphics/evidence_profile_pictures/evidence/phoenix_badge.gbapal" - .global gUnknown_081B59CC_gfx -gUnknown_081B59CC_gfx: .incbin "graphics/evidence_profile_pictures/evidence/phoenix_badge.4bpp" - .global gUnknown_081B61EC_pal -gUnknown_081B61EC_pal: .incbin "graphics/evidence_profile_pictures/evidence/generic_letter.gbapal" - .global gUnknown_081B61EC_gfx -gUnknown_081B61EC_gfx: .incbin "graphics/evidence_profile_pictures/evidence/generic_letter.4bpp" - .global gUnknown_081B6A0C_pal -gUnknown_081B6A0C_pal: .incbin "graphics/evidence_profile_pictures/evidence/note_from_the_safe.gbapal" - .global gUnknown_081B6A0C_gfx -gUnknown_081B6A0C_gfx: .incbin "graphics/evidence_profile_pictures/evidence/note_from_the_safe.4bpp" - .global gUnknown_081B722C_pal -gUnknown_081B722C_pal: .incbin "graphics/evidence_profile_pictures/evidence/generic_photo.gbapal" - .global gUnknown_081B722C_gfx -gUnknown_081B722C_gfx: .incbin "graphics/evidence_profile_pictures/evidence/generic_photo.4bpp" - .global gUnknown_081B7A4C_pal -gUnknown_081B7A4C_pal: .incbin "graphics/evidence_profile_pictures/profiles/dick_gumshoe.gbapal" - .global gUnknown_081B7A4C_gfx -gUnknown_081B7A4C_gfx: .incbin "graphics/evidence_profile_pictures/profiles/dick_gumshoe.4bpp" - .global gUnknown_081B826C_pal -gUnknown_081B826C_pal: .incbin "graphics/evidence_profile_pictures/profiles/april_may.gbapal" - .global gUnknown_081B826C_gfx -gUnknown_081B826C_gfx: .incbin "graphics/evidence_profile_pictures/profiles/april_may.4bpp" - .global gUnknown_081B8A8C_pal -gUnknown_081B8A8C_pal: .incbin "graphics/evidence_profile_pictures/profiles/bellboy.gbapal" - .global gUnknown_081B8A8C_gfx -gUnknown_081B8A8C_gfx: .incbin "graphics/evidence_profile_pictures/profiles/bellboy.4bpp" - .global gUnknown_081B92AC_pal -gUnknown_081B92AC_pal: .incbin "graphics/evidence_profile_pictures/profiles/redd_white.gbapal" - .global gUnknown_081B92AC_gfx -gUnknown_081B92AC_gfx: .incbin "graphics/evidence_profile_pictures/profiles/redd_white.4bpp" - .global gUnknown_081B9ACC_pal -gUnknown_081B9ACC_pal: .incbin "graphics/evidence_profile_pictures/evidence/the_thinker.gbapal" - .global gUnknown_081B9ACC_gfx -gUnknown_081B9ACC_gfx: .incbin "graphics/evidence_profile_pictures/evidence/the_thinker.4bpp" - .global gUnknown_081BA2EC_pal -gUnknown_081BA2EC_pal: .incbin "graphics/evidence_profile_pictures/evidence/cindy_stones_passport.gbapal" - .global gUnknown_081BA2EC_gfx -gUnknown_081BA2EC_gfx: .incbin "graphics/evidence_profile_pictures/evidence/cindy_stones_passport.4bpp" - .global gUnknown_081BAB0C_pal -gUnknown_081BAB0C_pal: .incbin "graphics/evidence_profile_pictures/evidence/generic_autopsy_report.gbapal" - .global gUnknown_081BAB0C_gfx -gUnknown_081BAB0C_gfx: .incbin "graphics/evidence_profile_pictures/evidence/generic_autopsy_report.4bpp" - .global gUnknown_081BB32C_pal -gUnknown_081BB32C_pal: .incbin "graphics/evidence_profile_pictures/evidence/generic_affidavit.gbapal" - .global gUnknown_081BB32C_gfx -gUnknown_081BB32C_gfx: .incbin "graphics/evidence_profile_pictures/evidence/generic_affidavit.4bpp" - .global gUnknown_081BBB4C_pal -gUnknown_081BBB4C_pal: .incbin "graphics/evidence_profile_pictures/profiles/mia_fey.gbapal" - .global gUnknown_081BBB4C_gfx -gUnknown_081BBB4C_gfx: .incbin "graphics/evidence_profile_pictures/profiles/mia_fey.4bpp" - .global gUnknown_081BC36C_pal -gUnknown_081BC36C_pal: .incbin "graphics/evidence_profile_pictures/profiles/larry_butz.gbapal" - .global gUnknown_081BC36C_gfx -gUnknown_081BC36C_gfx: .incbin "graphics/evidence_profile_pictures/profiles/larry_butz.4bpp" - .global gUnknown_081BCB8C_pal -gUnknown_081BCB8C_pal: .incbin "graphics/evidence_profile_pictures/profiles/cindy_stone.gbapal" - .global gUnknown_081BCB8C_gfx -gUnknown_081BCB8C_gfx: .incbin "graphics/evidence_profile_pictures/profiles/cindy_stone.4bpp" - .global gUnknown_081BD3AC_pal -gUnknown_081BD3AC_pal: .incbin "graphics/evidence_profile_pictures/profiles/frank_sahwit.gbapal" - .global gUnknown_081BD3AC_gfx -gUnknown_081BD3AC_gfx: .incbin "graphics/evidence_profile_pictures/profiles/frank_sahwit.4bpp" - .global gUnknown_081BDBCC_pal -gUnknown_081BDBCC_pal: .incbin "graphics/evidence_profile_pictures/profiles/winston_payne.gbapal" - .global gUnknown_081BDBCC_gfx -gUnknown_081BDBCC_gfx: .incbin "graphics/evidence_profile_pictures/profiles/winston_payne.4bpp" - .global gUnknown_081BE3EC_pal -gUnknown_081BE3EC_pal: .incbin "graphics/evidence_profile_pictures/profiles/maya_fey.gbapal" - .global gUnknown_081BE3EC_gfx -gUnknown_081BE3EC_gfx: .incbin "graphics/evidence_profile_pictures/profiles/maya_fey.4bpp" - .global gUnknown_081BEC0C_pal -gUnknown_081BEC0C_pal: .incbin "graphics/evidence_profile_pictures/evidence/maya_memo.gbapal" - .global gUnknown_081BEC0C_gfx -gUnknown_081BEC0C_gfx: .incbin "graphics/evidence_profile_pictures/evidence/maya_memo.4bpp" - .global gUnknown_081BF42C_pal -gUnknown_081BF42C_pal: .incbin "graphics/evidence_profile_pictures/evidence/steel_samurai_spear.gbapal" - .global gUnknown_081BF42C_gfx -gUnknown_081BF42C_gfx: .incbin "graphics/evidence_profile_pictures/evidence/steel_samurai_spear.4bpp" - .global gUnknown_081BFC4C_pal -gUnknown_081BFC4C_pal: .incbin "graphics/evidence_profile_pictures/evidence/glass_shards.gbapal" - .global gUnknown_081BFC4C_gfx -gUnknown_081BFC4C_gfx: .incbin "graphics/evidence_profile_pictures/evidence/glass_shards.4bpp" - .global gUnknown_081C046C_pal -gUnknown_081C046C_pal: .incbin "graphics/evidence_profile_pictures/evidence/generic_newspaper_clipping.gbapal" - .global gUnknown_081C046C_gfx -gUnknown_081C046C_gfx: .incbin "graphics/evidence_profile_pictures/evidence/generic_newspaper_clipping.4bpp" - .global gUnknown_081C0C8C_pal -gUnknown_081C0C8C_pal: .incbin "graphics/evidence_profile_pictures/profiles/misty_fey.gbapal" - .global gUnknown_081C0C8C_gfx -gUnknown_081C0C8C_gfx: .incbin "graphics/evidence_profile_pictures/profiles/misty_fey.4bpp" - .global gUnknown_081C14AC_pal -gUnknown_081C14AC_pal: .incbin "graphics/evidence_profile_pictures/profiles/marvin_grossberg.gbapal" - .global gUnknown_081C14AC_gfx -gUnknown_081C14AC_gfx: .incbin "graphics/evidence_profile_pictures/profiles/marvin_grossberg.4bpp" - .global gUnknown_081C1CCC_pal -gUnknown_081C1CCC_pal: .incbin "graphics/evidence_profile_pictures/profiles/miles_edgeworth.gbapal" - .global gUnknown_081C1CCC_gfx -gUnknown_081C1CCC_gfx: .incbin "graphics/evidence_profile_pictures/profiles/miles_edgeworth.4bpp" - .global gUnknown_081C24EC_pal -gUnknown_081C24EC_pal: .incbin "graphics/evidence_profile_pictures/evidence/steel_samurai_cards.gbapal" - .global gUnknown_081C24EC_gfx -gUnknown_081C24EC_gfx: .incbin "graphics/evidence_profile_pictures/evidence/steel_samurai_cards.4bpp" - .global gUnknown_081C2D0C_pal -gUnknown_081C2D0C_pal: .incbin "graphics/evidence_profile_pictures/evidence/steel_samurai_ultra_rare_card.gbapal" - .global gUnknown_081C2D0C_gfx -gUnknown_081C2D0C_gfx: .incbin "graphics/evidence_profile_pictures/evidence/steel_samurai_ultra_rare_card.4bpp" - .global gUnknown_081C352C_pal -gUnknown_081C352C_pal: .incbin "graphics/evidence_profile_pictures/evidence/empty_bottle.gbapal" - .global gUnknown_081C352C_gfx -gUnknown_081C352C_gfx: .incbin "graphics/evidence_profile_pictures/evidence/empty_bottle.4bpp" - .global gUnknown_081C3D4C_pal -gUnknown_081C3D4C_pal: .incbin "graphics/evidence_profile_pictures/evidence/steel_samurai_script.gbapal" - .global gUnknown_081C3D4C_gfx -gUnknown_081C3D4C_gfx: .incbin "graphics/evidence_profile_pictures/evidence/steel_samurai_script.4bpp" - .global gUnknown_081C456C_pal -gUnknown_081C456C_pal: .incbin "graphics/evidence_profile_pictures/evidence/codys_digital_camera.gbapal" - .global gUnknown_081C456C_gfx -gUnknown_081C456C_gfx: .incbin "graphics/evidence_profile_pictures/evidence/codys_digital_camera.4bpp" - .global gUnknown_081C4D8C_pal -gUnknown_081C4D8C_pal: .incbin "graphics/evidence_profile_pictures/evidence/plate_with_steak_bones.gbapal" - .global gUnknown_081C4D8C_gfx -gUnknown_081C4D8C_gfx: .incbin "graphics/evidence_profile_pictures/evidence/plate_with_steak_bones.4bpp" - .global gUnknown_081C55AC_pal -gUnknown_081C55AC_pal: .incbin "graphics/evidence_profile_pictures/evidence/global_studios_card_key.gbapal" - .global gUnknown_081C55AC_gfx -gUnknown_081C55AC_gfx: .incbin "graphics/evidence_profile_pictures/evidence/global_studios_card_key.4bpp" - .global gUnknown_081C5DCC_pal -gUnknown_081C5DCC_pal: .incbin "graphics/evidence_profile_pictures/evidence/key_to_cottage.gbapal" - .global gUnknown_081C5DCC_gfx -gUnknown_081C5DCC_gfx: .incbin "graphics/evidence_profile_pictures/evidence/key_to_cottage.4bpp" - .global gUnknown_081C65EC_pal -gUnknown_081C65EC_pal: .incbin "graphics/evidence_profile_pictures/evidence/mr_monkey.gbapal" - .global gUnknown_081C65EC_gfx -gUnknown_081C65EC_gfx: .incbin "graphics/evidence_profile_pictures/evidence/mr_monkey.4bpp" - .global gUnknown_081C6E0C_pal -gUnknown_081C6E0C_pal: .incbin "graphics/evidence_profile_pictures/evidence/codys_steel_samurai_scrapbook.gbapal" - .global gUnknown_081C6E0C_gfx -gUnknown_081C6E0C_gfx: .incbin "graphics/evidence_profile_pictures/evidence/codys_steel_samurai_scrapbook.4bpp" - .global gUnknown_081C762C_pal -gUnknown_081C762C_pal: .incbin "graphics/evidence_profile_pictures/evidence/global_studios_van.gbapal" - .global gUnknown_081C762C_gfx -gUnknown_081C762C_gfx: .incbin "graphics/evidence_profile_pictures/evidence/global_studios_van.4bpp" - .global gUnknown_081C7E4C_pal -gUnknown_081C7E4C_pal: .incbin "graphics/evidence_profile_pictures/profiles/cody_hackins.gbapal" - .global gUnknown_081C7E4C_gfx -gUnknown_081C7E4C_gfx: .incbin "graphics/evidence_profile_pictures/profiles/cody_hackins.4bpp" - .global gUnknown_081C866C_pal -gUnknown_081C866C_pal: .incbin "graphics/evidence_profile_pictures/profiles/will_powers.gbapal" - .global gUnknown_081C866C_gfx -gUnknown_081C866C_gfx: .incbin "graphics/evidence_profile_pictures/profiles/will_powers.4bpp" - .global gUnknown_081C8E8C_pal -gUnknown_081C8E8C_pal: .incbin "graphics/evidence_profile_pictures/profiles/dee_vasquez.gbapal" - .global gUnknown_081C8E8C_gfx -gUnknown_081C8E8C_gfx: .incbin "graphics/evidence_profile_pictures/profiles/dee_vasquez.4bpp" - .global gUnknown_081C96AC_pal -gUnknown_081C96AC_pal: .incbin "graphics/evidence_profile_pictures/profiles/penny_nichols.gbapal" - .global gUnknown_081C96AC_gfx -gUnknown_081C96AC_gfx: .incbin "graphics/evidence_profile_pictures/profiles/penny_nichols.4bpp" - .global gUnknown_081C9ECC_pal -gUnknown_081C9ECC_pal: .incbin "graphics/evidence_profile_pictures/profiles/sal_manella.gbapal" - .global gUnknown_081C9ECC_gfx -gUnknown_081C9ECC_gfx: .incbin "graphics/evidence_profile_pictures/profiles/sal_manella.4bpp" - .global gUnknown_081CA6EC_pal -gUnknown_081CA6EC_pal: .incbin "graphics/evidence_profile_pictures/profiles/jack_hammer.gbapal" - .global gUnknown_081CA6EC_gfx -gUnknown_081CA6EC_gfx: .incbin "graphics/evidence_profile_pictures/profiles/jack_hammer.4bpp" - .global gUnknown_081CAF0C_pal -gUnknown_081CAF0C_pal: .incbin "graphics/evidence_profile_pictures/profiles/wendy_oldbag.gbapal" - .global gUnknown_081CAF0C_gfx -gUnknown_081CAF0C_gfx: .incbin "graphics/evidence_profile_pictures/profiles/wendy_oldbag.4bpp" - .global gUnknown_081CB72C_pal -gUnknown_081CB72C_pal: .incbin "graphics/evidence_profile_pictures/evidence/firecrackers.gbapal" - .global gUnknown_081CB72C_gfx -gUnknown_081CB72C_gfx: .incbin "graphics/evidence_profile_pictures/evidence/firecrackers.4bpp" - .global gUnknown_081CBF4C_pal -gUnknown_081CBF4C_pal: .incbin "graphics/evidence_profile_pictures/evidence/pistol.gbapal" - .global gUnknown_081CBF4C_gfx -gUnknown_081CBF4C_gfx: .incbin "graphics/evidence_profile_pictures/evidence/pistol.4bpp" - .global gUnknown_081CC76C_pal -gUnknown_081CC76C_pal: .incbin "graphics/evidence_profile_pictures/evidence/air_tube.gbapal" - .global gUnknown_081CC76C_gfx -gUnknown_081CC76C_gfx: .incbin "graphics/evidence_profile_pictures/evidence/air_tube.4bpp" - .global gUnknown_081CCF8C_pal -gUnknown_081CCF8C_pal: .incbin "graphics/evidence_profile_pictures/evidence/metal_detector.gbapal" - .global gUnknown_081CCF8C_gfx -gUnknown_081CCF8C_gfx: .incbin "graphics/evidence_profile_pictures/evidence/metal_detector.4bpp" - .global gUnknown_081CD7AC_pal -gUnknown_081CD7AC_pal: .incbin "graphics/evidence_profile_pictures/evidence/missile.gbapal" - .global gUnknown_081CD7AC_gfx -gUnknown_081CD7AC_gfx: .incbin "graphics/evidence_profile_pictures/evidence/missile.4bpp" - .global gUnknown_081CDFCC_pal -gUnknown_081CDFCC_pal: .incbin "graphics/evidence_profile_pictures/evidence/missile_angry.gbapal" - .global gUnknown_081CDFCC_gfx -gUnknown_081CDFCC_gfx: .incbin "graphics/evidence_profile_pictures/evidence/missile_angry.4bpp" - .global gUnknown_081CE7EC_pal -gUnknown_081CE7EC_pal: .incbin "graphics/evidence_profile_pictures/evidence/dl-6_bullet.gbapal" - .global gUnknown_081CE7EC_gfx -gUnknown_081CE7EC_gfx: .incbin "graphics/evidence_profile_pictures/evidence/dl-6_bullet.4bpp" - .global gUnknown_081CF00C_pal -gUnknown_081CF00C_pal: .incbin "graphics/evidence_profile_pictures/evidence/fishing_pole.gbapal" - .global gUnknown_081CF00C_gfx -gUnknown_081CF00C_gfx: .incbin "graphics/evidence_profile_pictures/evidence/fishing_pole.4bpp" - .global gUnknown_081CF82C_pal -gUnknown_081CF82C_pal: .incbin "graphics/evidence_profile_pictures/evidence/polly.gbapal" - .global gUnknown_081CF82C_gfx -gUnknown_081CF82C_gfx: .incbin "graphics/evidence_profile_pictures/evidence/polly.4bpp" - .global gUnknown_081D004C_pal -gUnknown_081D004C_pal: .incbin "graphics/evidence_profile_pictures/profiles/lotta_hart.gbapal" - .global gUnknown_081D004C_gfx -gUnknown_081D004C_gfx: .incbin "graphics/evidence_profile_pictures/profiles/lotta_hart.4bpp" - .global gUnknown_081D086C_pal -gUnknown_081D086C_pal: .incbin "graphics/evidence_profile_pictures/profiles/manfred_von_karma.gbapal" - .global gUnknown_081D086C_gfx -gUnknown_081D086C_gfx: .incbin "graphics/evidence_profile_pictures/profiles/manfred_von_karma.4bpp" - .global gUnknown_081D108C_pal -gUnknown_081D108C_pal: .incbin "graphics/evidence_profile_pictures/profiles/gregory_edgeworth.gbapal" - .global gUnknown_081D108C_gfx -gUnknown_081D108C_gfx: .incbin "graphics/evidence_profile_pictures/profiles/gregory_edgeworth.4bpp" - .global gUnknown_081D18AC_pal -gUnknown_081D18AC_pal: .incbin "graphics/evidence_profile_pictures/profiles/robert_hammond.gbapal" - .global gUnknown_081D18AC_gfx -gUnknown_081D18AC_gfx: .incbin "graphics/evidence_profile_pictures/profiles/robert_hammond.4bpp" - .global gUnknown_081D20CC_pal -gUnknown_081D20CC_pal: .incbin "graphics/evidence_profile_pictures/profiles/old_man.gbapal" - .global gUnknown_081D20CC_gfx -gUnknown_081D20CC_gfx: .incbin "graphics/evidence_profile_pictures/profiles/old_man.4bpp" - .global gUnknown_081D28EC_pal -gUnknown_081D28EC_pal: .incbin "graphics/evidence_profile_pictures/evidence/yannis_safe.gbapal" - .global gUnknown_081D28EC_gfx -gUnknown_081D28EC_gfx: .incbin "graphics/evidence_profile_pictures/evidence/yannis_safe.4bpp" @ END EVIDENCE AND PROFILE PICTURES diff --git a/include/graphics.h b/include/graphics.h index 7395950..7e5944f 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -578,134 +578,8 @@ extern u8 gGfxEvidenceGenericLetter3_description[]; extern u8 gGfxEvidenceDl6Bullet_description[]; extern u8 gGfxEvidenceMissileAngry_description[]; extern u8 gGfxEvidenceProfilePictures[]; -extern u8 gPalEvidenceEmptyPlate[]; -extern u8 gGfxEvidenceEmptyPlate[]; -extern u8 gPalEvidenceLottasCamera[]; -extern u8 gGfxEvidenceLottasCamera[]; -extern u8 gPalEvidenceWiretap[]; -extern u8 gGfxEvidenceWiretap[]; -extern u8 gPalEvidenceMayasCellphone[]; -extern u8 gGfxEvidenceMayasCellphone[]; -extern u8 gPalEvidenceArticleGourdy[]; -extern u8 gGfxEvidenceArticleGourdy[]; -extern u8 gPalEvidenceBullet[]; -extern u8 gGfxEvidenceBullet[]; -extern u8 gUnknown_081B59CC_pal[]; -extern u8 gUnknown_081B59CC_gfx[]; -extern u8 gUnknown_081B61EC_pal[]; -extern u8 gUnknown_081B61EC_gfx[]; -extern u8 gUnknown_081B6A0C_pal[]; -extern u8 gUnknown_081B6A0C_gfx[]; -extern u8 gUnknown_081B722C_pal[]; -extern u8 gUnknown_081B722C_gfx[]; -extern u8 gUnknown_081B7A4C_pal[]; -extern u8 gUnknown_081B7A4C_gfx[]; -extern u8 gUnknown_081B826C_pal[]; -extern u8 gUnknown_081B826C_gfx[]; -extern u8 gUnknown_081B8A8C_pal[]; -extern u8 gUnknown_081B8A8C_gfx[]; -extern u8 gUnknown_081B92AC_pal[]; -extern u8 gUnknown_081B92AC_gfx[]; -extern u8 gUnknown_081B9ACC_pal[]; -extern u8 gUnknown_081B9ACC_gfx[]; -extern u8 gUnknown_081BA2EC_pal[]; -extern u8 gUnknown_081BA2EC_gfx[]; -extern u8 gUnknown_081BAB0C_pal[]; -extern u8 gUnknown_081BAB0C_gfx[]; -extern u8 gUnknown_081BB32C_pal[]; -extern u8 gUnknown_081BB32C_gfx[]; -extern u8 gUnknown_081BBB4C_pal[]; -extern u8 gUnknown_081BBB4C_gfx[]; -extern u8 gUnknown_081BC36C_pal[]; -extern u8 gUnknown_081BC36C_gfx[]; -extern u8 gUnknown_081BCB8C_pal[]; -extern u8 gUnknown_081BCB8C_gfx[]; -extern u8 gUnknown_081BD3AC_pal[]; -extern u8 gUnknown_081BD3AC_gfx[]; -extern u8 gUnknown_081BDBCC_pal[]; -extern u8 gUnknown_081BDBCC_gfx[]; -extern u8 gUnknown_081BE3EC_pal[]; -extern u8 gUnknown_081BE3EC_gfx[]; -extern u8 gUnknown_081BEC0C_pal[]; -extern u8 gUnknown_081BEC0C_gfx[]; -extern u8 gUnknown_081BF42C_pal[]; -extern u8 gUnknown_081BF42C_gfx[]; -extern u8 gUnknown_081BFC4C_pal[]; -extern u8 gUnknown_081BFC4C_gfx[]; -extern u8 gUnknown_081C046C_pal[]; -extern u8 gUnknown_081C046C_gfx[]; -extern u8 gUnknown_081C0C8C_pal[]; -extern u8 gUnknown_081C0C8C_gfx[]; -extern u8 gUnknown_081C14AC_pal[]; -extern u8 gUnknown_081C14AC_gfx[]; -extern u8 gUnknown_081C1CCC_pal[]; -extern u8 gUnknown_081C1CCC_gfx[]; -extern u8 gUnknown_081C24EC_pal[]; -extern u8 gUnknown_081C24EC_gfx[]; -extern u8 gUnknown_081C2D0C_pal[]; -extern u8 gUnknown_081C2D0C_gfx[]; -extern u8 gUnknown_081C352C_pal[]; -extern u8 gUnknown_081C352C_gfx[]; -extern u8 gUnknown_081C3D4C_pal[]; -extern u8 gUnknown_081C3D4C_gfx[]; -extern u8 gUnknown_081C456C_pal[]; -extern u8 gUnknown_081C456C_gfx[]; -extern u8 gUnknown_081C4D8C_pal[]; -extern u8 gUnknown_081C4D8C_gfx[]; -extern u8 gUnknown_081C55AC_pal[]; -extern u8 gUnknown_081C55AC_gfx[]; -extern u8 gUnknown_081C5DCC_pal[]; -extern u8 gUnknown_081C5DCC_gfx[]; -extern u8 gUnknown_081C65EC_pal[]; -extern u8 gUnknown_081C65EC_gfx[]; -extern u8 gUnknown_081C6E0C_pal[]; -extern u8 gUnknown_081C6E0C_gfx[]; -extern u8 gUnknown_081C762C_pal[]; -extern u8 gUnknown_081C762C_gfx[]; -extern u8 gUnknown_081C7E4C_pal[]; -extern u8 gUnknown_081C7E4C_gfx[]; -extern u8 gUnknown_081C866C_pal[]; -extern u8 gUnknown_081C866C_gfx[]; -extern u8 gUnknown_081C8E8C_pal[]; -extern u8 gUnknown_081C8E8C_gfx[]; -extern u8 gUnknown_081C96AC_pal[]; -extern u8 gUnknown_081C96AC_gfx[]; -extern u8 gUnknown_081C9ECC_pal[]; -extern u8 gUnknown_081C9ECC_gfx[]; -extern u8 gUnknown_081CA6EC_pal[]; -extern u8 gUnknown_081CA6EC_gfx[]; -extern u8 gUnknown_081CAF0C_pal[]; -extern u8 gUnknown_081CAF0C_gfx[]; -extern u8 gUnknown_081CB72C_pal[]; -extern u8 gUnknown_081CB72C_gfx[]; -extern u8 gUnknown_081CBF4C_pal[]; -extern u8 gUnknown_081CBF4C_gfx[]; -extern u8 gUnknown_081CC76C_pal[]; -extern u8 gUnknown_081CC76C_gfx[]; -extern u8 gUnknown_081CCF8C_pal[]; -extern u8 gUnknown_081CCF8C_gfx[]; -extern u8 gUnknown_081CD7AC_pal[]; -extern u8 gUnknown_081CD7AC_gfx[]; -extern u8 gUnknown_081CDFCC_pal[]; -extern u8 gUnknown_081CDFCC_gfx[]; -extern u8 gUnknown_081CE7EC_pal[]; -extern u8 gUnknown_081CE7EC_gfx[]; -extern u8 gUnknown_081CF00C_pal[]; -extern u8 gUnknown_081CF00C_gfx[]; -extern u8 gUnknown_081CF82C_pal[]; -extern u8 gUnknown_081CF82C_gfx[]; -extern u8 gUnknown_081D004C_pal[]; -extern u8 gUnknown_081D004C_gfx[]; -extern u8 gUnknown_081D086C_pal[]; -extern u8 gUnknown_081D086C_gfx[]; -extern u8 gUnknown_081D108C_pal[]; -extern u8 gUnknown_081D108C_gfx[]; -extern u8 gUnknown_081D18AC_pal[]; -extern u8 gUnknown_081D18AC_gfx[]; -extern u8 gUnknown_081D20CC_pal[]; -extern u8 gUnknown_081D20CC_gfx[]; -extern u8 gUnknown_081D28EC_pal[]; -extern u8 gUnknown_081D28EC_gfx[]; +// extern u8 gGfxEvidenceProfilePictures[]; + extern u8 gTextPal[]; extern u8 gCharSet[]; extern u8 gPalChoiceSelected[]; From 8ad0be6f2c8482b146b181ff49018cc4597e53ba Mon Sep 17 00:00:00 2001 From: Missingmew Date: Sat, 2 Sep 2023 21:36:52 +0200 Subject: [PATCH 09/17] some whitespace cleanup --- data/graphics.s | 156 ------------------------------------------------ 1 file changed, 156 deletions(-) diff --git a/data/graphics.s b/data/graphics.s index 224f571..ba2b05a 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -1406,44 +1406,36 @@ gGfx_BG063_Case3SteelSamurai: gPal_BG064_BustupPhoenix: .incbin "graphics/bustup_phoenix.gbapal" - .global gMap_BG064_BustupPhoenix gMap_BG064_BustupPhoenix: .incbin "graphics/bustup_phoenix.bin" - .global gGfx_BG064_BustupPhoenix gGfx_BG064_BustupPhoenix: .incbin "graphics/bustup_phoenix.4bpp" - .global gPal_BG065_BustupEdgeworth gPal_BG065_BustupEdgeworth: .incbin "graphics/bustup_edgeworth.gbapal" - .global gMap_BG065_BustupEdgeworth gMap_BG065_BustupEdgeworth: .incbin "graphics/bustup_edgeworth.bin" - .global gGfx_BG065_BustupEdgeworth gGfx_BG065_BustupEdgeworth: .incbin "graphics/bustup_edgeworth.4bpp" @ ; BEGIN BACKGROUNDS - .global gGfx_BG066_Speedlines gGfx_BG066_Speedlines: .incbin "graphics/striped_images/speedlines.4bpp.striped" - .global gGfx_BG067_CourtroomBackground gGfx_BG067_CourtroomBackground: .incbin "graphics/striped_images/courtroom_background.4bpp.striped" - .global gGfx_BG068_CapcomScreen gGfx_BG068_CapcomScreen: .incbin "graphics/striped_images/capcom_screen.4bpp.striped" @@ -1452,212 +1444,170 @@ gGfx_BG068_CapcomScreen: gGfx_BG069_SteelSamuraiNight: .incbin "graphics/striped_images/steel_samurai_night.4bpp.striped" - .global gGfx_BG070_GourdLakeEntrance gGfx_BG070_GourdLakeEntrance: .incbin "graphics/striped_images/gourd_lake_entrance.8bpp.striped" - .global gGfx_BG071_GourdLakePark gGfx_BG071_GourdLakePark: .incbin "graphics/striped_images/gourd_lake_park.8bpp.striped" - .global gGfx_BG072_GourdLakeParkNoBalloon gGfx_BG072_GourdLakeParkNoBalloon: .incbin "graphics/striped_images/gourd_lake_park_no_balloon.8bpp.striped" - .global gGfx_BG073_GourdLakeBeach gGfx_BG073_GourdLakeBeach: .incbin "graphics/striped_images/gourd_lake_beach.8bpp.striped" - .global gGfx_BG074_Case3IntroGrass gGfx_BG074_Case3IntroGrass: .incbin "graphics/striped_images/case3_intro_grass.4bpp.striped" - .global gGfx_BG075_Case3IntroTrees gGfx_BG075_Case3IntroTrees: .incbin "graphics/striped_images/case3_intro_trees.4bpp.striped" - .global gGfx_BG076_Case3IntroSteelSamuraiPosing gGfx_BG076_Case3IntroSteelSamuraiPosing: .incbin "graphics/striped_images/case3_intro_steel_samurai_posing.4bpp.striped" - .global gGfx_BG077_GourdLakeBoatRental gGfx_BG077_GourdLakeBoatRental: .incbin "graphics/striped_images/gourd_lake_boat_rental.8bpp.striped" - .global gGfx_BG078_GourdLakeBoatRentalHouse gGfx_BG078_GourdLakeBoatRentalHouse: .incbin "graphics/striped_images/gourd_lake_boat_rental_house.8bpp.striped" - .global gGfx_BG079_PoliceStationLobby gGfx_BG079_PoliceStationLobby: .incbin "graphics/striped_images/police_station_lobby.8bpp.striped" - .global gGfx_BG080_PoliceStationEvidenceStorage gGfx_BG080_PoliceStationEvidenceStorage: .incbin "graphics/striped_images/police_station_evidence_storage.8bpp.striped" - .global gGfx_BG081_Case3IntroFaceoff gGfx_BG081_Case3IntroFaceoff: .incbin "graphics/striped_images/case3_intro_faceoff.4bpp.striped" - .global gGfx_BG082_EvidenceDL6CaseFile1 gGfx_BG082_EvidenceDL6CaseFile1: .incbin "graphics/striped_images/backgrounds/evidence/dl6_case_file_page_1.4bpp.striped" - .global gGfx_BG083_EvidenceDL6CaseFile2 gGfx_BG083_EvidenceDL6CaseFile2: .incbin "graphics/striped_images/backgrounds/evidence/dl6_case_file_page_2.4bpp.striped" - .global gGfx_BG084_EvidenceDL6CaseFile3 gGfx_BG084_EvidenceDL6CaseFile3: .incbin "graphics/striped_images/backgrounds/evidence/dl6_case_file_page_3.4bpp.striped" - .global gGfx_BG085_Case4TrainStation gGfx_BG085_Case4TrainStation: .incbin "graphics/striped_images/case4_train_station.8bpp.striped" - .global gGfx_BG086_Case4GourdLakeMap gGfx_BG086_Case4GourdLakeMap: .incbin "graphics/striped_images/case4_gourd_lake_map.4bpp.striped" - .global gGfx_BG087_Case4LottasPhotoZoomed gGfx_BG087_Case4LottasPhotoZoomed: .incbin "graphics/striped_images/case4_lottas_photo_zoomed.4bpp.striped" - .global gGfx_BG088_Case4ElevatorPhoto gGfx_BG088_Case4ElevatorPhoto: .incbin "graphics/striped_images/case4_elevator_photo.4bpp.striped" - .global gGfx_BG089_Case4Newspaper gGfx_BG089_Case4Newspaper: .incbin "graphics/striped_images/case4_newspaper.8bpp.striped" - .global gGfx_BG090_Case4BalloonLaunching gGfx_BG090_Case4BalloonLaunching: .incbin "graphics/striped_images/case4_balloon_launching.4bpp.striped" - .global gGfx_BG091_Case4BalloonLandingInLake gGfx_BG091_Case4BalloonLandingInLake: .incbin "graphics/striped_images/case4_balloon_landing_in_lake.4bpp.striped" - .global gGfx_BG092_Case4LarrySearchingLake gGfx_BG092_Case4LarrySearchingLake: .incbin "graphics/striped_images/case4_larry_searching_lake.4bpp.striped" - .global gGfx_BG093_Case4ClassTrial gGfx_BG093_Case4ClassTrial: .incbin "graphics/striped_images/case4_class_trial.8bpp.striped" - .global gGfx_BG094_Case4LottasPhotoFar gGfx_BG094_Case4LottasPhotoFar: .incbin "graphics/striped_images/case4_lottas_photo_far.4bpp.striped" - .global gGfx_BG095_Case4ClassTrialPhoenix gGfx_BG095_Case4ClassTrialPhoenix: .incbin "graphics/striped_images/case4_class_trial_phoenix.8bpp.striped" - .global gGfx_BG096_Case4ClassTrialEdgeworth gGfx_BG096_Case4ClassTrialEdgeworth: .incbin "graphics/striped_images/case4_class_trial_edgeworth.8bpp.striped" - .global gGfx_BG097_Case4ClassTrialLarry gGfx_BG097_Case4ClassTrialLarry: .incbin "graphics/striped_images/case4_class_trial_larry.8bpp.striped" - .global gGfx_BG098_Case4YanniThreatening gGfx_BG098_Case4YanniThreatening: .incbin "graphics/striped_images/case4_yanni_threatening.4bpp.striped" - .global gGfx_BG099_Case4ShootWaterFromBoat gGfx_BG099_Case4ShootWaterFromBoat: .incbin "graphics/striped_images/case4_shoot_water_from_boat.4bpp.striped" - .global gGfx_BG100_Case4ElevatorSuffocating gGfx_BG100_Case4ElevatorSuffocating: .incbin "graphics/striped_images/case4_elevator_suffocating.4bpp.striped" - .global gGfx_BG101_Case4ElevatorEdgeworthThrow gGfx_BG101_Case4ElevatorEdgeworthThrow: .incbin "graphics/striped_images/case4_elevator_edgeworth_throw.4bpp.striped" - .global gGfx_BG102_Case4ElevatorVonKarmaShot gGfx_BG102_Case4ElevatorVonKarmaShot: .incbin "graphics/striped_images/case4_elevator_vonkarma_shot.4bpp.striped" - .global gGfx_BG103_Case4ElevatorVonKarmaInDoor gGfx_BG103_Case4ElevatorVonKarmaInDoor: .incbin "graphics/striped_images/case4_elevator_vonkarma_in_door.4bpp.striped" - .global gGfx_BG104_Case4TrainStationMayaLeaving gGfx_BG104_Case4TrainStationMayaLeaving: .incbin "graphics/striped_images/case4_train_station_maya_leaving.8bpp.striped" - .global gGfx_BG105_TrialWon gGfx_BG105_TrialWon: .incbin "graphics/striped_images/trial_won.8bpp.striped" - .global gGfx_BG106_Case4IntroLakeOneInBoat gGfx_BG106_Case4IntroLakeOneInBoat: .incbin "graphics/striped_images/case4_intro_lake_one_in_boat.4bpp.striped" - .global gGfx_BG107_Case4IntroThreatenedToShoot gGfx_BG107_Case4IntroThreatenedToShoot: .incbin "graphics/striped_images/case4_intro_threatened_to_shoot.4bpp.striped" - .global gGfx_BG108_Case4IntroEdgeworthPicksUpGun gGfx_BG108_Case4IntroEdgeworthPicksUpGun: .incbin "graphics/striped_images/case4_intro_edgeworth_picks_gun_up.8bpp.striped" - .global gGfx_BG109_CapcomScreenBW gGfx_BG109_CapcomScreenBW: .incbin "graphics/striped_images/capcom_screen_bw.4bpp.striped" - .global gGfx_BG110_DemoTitleScreen gGfx_BG110_DemoTitleScreen: .incbin "graphics/striped_images/title_screen_demo.8bpp.striped" - .global gGfx_BG111_DemoComingSoon gGfx_BG111_DemoComingSoon: .incbin "graphics/striped_images/coming_soon_screen.8bpp.striped" @@ -1828,257 +1778,206 @@ gGfxCourtscroll03: gGfxPixAnimationChar01: .incbin "graphics/animations/characters/animation01.pix" - .global gGfxSeqAnimationChar01 gGfxSeqAnimationChar01: .incbin "graphics/animations/characters/animation01.seq" - .global gGfxPixAnimationChar02 gGfxPixAnimationChar02: .incbin "graphics/animations/characters/animation02.pix" - .global gGfxSeqAnimationChar02 gGfxSeqAnimationChar02: .incbin "graphics/animations/characters/animation02.seq" - .global gGfxPixAnimationChar03 gGfxPixAnimationChar03: .incbin "graphics/animations/characters/animation03.pix" - .global gGfxSeqAnimationChar03 gGfxSeqAnimationChar03: .incbin "graphics/animations/characters/animation03.seq" - .global gGfxPixAnimationChar04 gGfxPixAnimationChar04: .incbin "graphics/animations/characters/animation04.pix" - .global gGfxSeqAnimationChar04 gGfxSeqAnimationChar04: .incbin "graphics/animations/characters/animation04.seq" - .global gGfxPixAnimationChar05 gGfxPixAnimationChar05: .incbin "graphics/animations/characters/animation05.pix" - .global gGfxSeqAnimationChar05 gGfxSeqAnimationChar05: .incbin "graphics/animations/characters/animation05.seq" - .global gGfxPixAnimationChar06 gGfxPixAnimationChar06: .incbin "graphics/animations/characters/animation06.pix" - .global gGfxSeqAnimationChar06 gGfxSeqAnimationChar06: .incbin "graphics/animations/characters/animation06.seq" - .global gGfxPixAnimationChar07 gGfxPixAnimationChar07: .incbin "graphics/animations/characters/animation07.pix" - .global gGfxSeqAnimationChar07 gGfxSeqAnimationChar07: .incbin "graphics/animations/characters/animation07.seq" - .global gGfxPixAnimationChar08 gGfxPixAnimationChar08: .incbin "graphics/animations/characters/animation08.pix" - .global gGfxSeqAnimationChar08 gGfxSeqAnimationChar08: .incbin "graphics/animations/characters/animation08.seq" - .global gGfxPixAnimationChar09 gGfxPixAnimationChar09: .incbin "graphics/animations/characters/animation09.pix" - .global gGfxSeqAnimationChar09 gGfxSeqAnimationChar09: .incbin "graphics/animations/characters/animation09.seq" - .global gGfxPixAnimationChar10 gGfxPixAnimationChar10: .incbin "graphics/animations/characters/animation10.pix" - .global gGfxSeqAnimationChar10 gGfxSeqAnimationChar10: .incbin "graphics/animations/characters/animation10.seq" - .global gGfxPixAnimationChar11 gGfxPixAnimationChar11: .incbin "graphics/animations/characters/animation11.pix" - .global gGfxSeqAnimationChar11 gGfxSeqAnimationChar11: .incbin "graphics/animations/characters/animation11.seq" - .global gGfxPixAnimationChar12 gGfxPixAnimationChar12: .incbin "graphics/animations/characters/animation12.pix" - .global gGfxSeqAnimationChar12 gGfxSeqAnimationChar12: .incbin "graphics/animations/characters/animation12.seq" - .global gGfxPixAnimationChar13 gGfxPixAnimationChar13: .incbin "graphics/animations/characters/animation13.pix" - .global gGfxSeqAnimationChar13 gGfxSeqAnimationChar13: .incbin "graphics/animations/characters/animation13.seq" - .global gGfxPixAnimationChar14 gGfxPixAnimationChar14: .incbin "graphics/animations/characters/animation14.pix" - .global gGfxSeqAnimationChar14 gGfxSeqAnimationChar14: .incbin "graphics/animations/characters/animation14.seq" - .global gGfxPixAnimationChar15 gGfxPixAnimationChar15: .incbin "graphics/animations/characters/animation15.pix" - .global gGfxSeqAnimationChar15 gGfxSeqAnimationChar15: .incbin "graphics/animations/characters/animation15.seq" - .global gGfxPixAnimationChar16 gGfxPixAnimationChar16: .incbin "graphics/animations/characters/animation16.pix" - .global gGfxSeqAnimationChar16 gGfxSeqAnimationChar16: .incbin "graphics/animations/characters/animation16.seq" - .global gGfxPixAnimationChar17 gGfxPixAnimationChar17: .incbin "graphics/animations/characters/animation17.pix" - .global gGfxSeqAnimationChar17 gGfxSeqAnimationChar17: .incbin "graphics/animations/characters/animation17.seq" - .global gGfxPixAnimationChar18 gGfxPixAnimationChar18: .incbin "graphics/animations/characters/animation18.pix" - .global gGfxSeqAnimationChar18 gGfxSeqAnimationChar18: .incbin "graphics/animations/characters/animation18.seq" - .global gGfxPixAnimationChar19 gGfxPixAnimationChar19: .incbin "graphics/animations/characters/animation19.pix" - .global gGfxSeqAnimationChar19 gGfxSeqAnimationChar19: .incbin "graphics/animations/characters/animation19.seq" - .global gGfxPixAnimationChar20 gGfxPixAnimationChar20: .incbin "graphics/animations/characters/animation20.pix" - .global gGfxSeqAnimationChar20 gGfxSeqAnimationChar20: .incbin "graphics/animations/characters/animation20.seq" - .global gGfxPixAnimationChar21 gGfxPixAnimationChar21: .incbin "graphics/animations/characters/animation21.pix" - .global gGfxSeqAnimationChar21 gGfxSeqAnimationChar21: .incbin "graphics/animations/characters/animation21.seq" - .global gGfxPixAnimationChar22 gGfxPixAnimationChar22: .incbin "graphics/animations/characters/animation22.pix" - .global gGfxSeqAnimationChar22 gGfxSeqAnimationChar22: .incbin "graphics/animations/characters/animation22.seq" - .global gGfxPixAnimationChar23 gGfxPixAnimationChar23: .incbin "graphics/animations/characters/animation23.pix" - .global gGfxSeqAnimationChar23 gGfxSeqAnimationChar23: .incbin "graphics/animations/characters/animation23.seq" - .global gGfxPixAnimationChar24 gGfxPixAnimationChar24: .incbin "graphics/animations/characters/animation24.pix" - .global gGfxSeqAnimationChar24 gGfxSeqAnimationChar24: .incbin "graphics/animations/characters/animation24.seq" - .global gGfxPixAnimationChar25 gGfxPixAnimationChar25: .incbin "graphics/animations/characters/animation25.pix" - .global gGfxSeqAnimationChar25 gGfxSeqAnimationChar25: .incbin "graphics/animations/characters/animation25.seq" - .global gGfxPixAnimationChar26 gGfxPixAnimationChar26: .incbin "graphics/animations/characters/animation26.pix" - .global gGfxSeqAnimationChar26 gGfxSeqAnimationChar26: .incbin "graphics/animations/characters/animation26.seq" @@ -2091,277 +1990,222 @@ gGfxSeqAnimationChar26: gGfxPixAnimationTileset01: .incbin "graphics/animations/tileset01.pix" - .global gGfxSeqAnimation01 gGfxSeqAnimation01: .incbin "graphics/animations/animation01.seq" - .global gGfxSeqAnimation02 gGfxSeqAnimation02: .incbin "graphics/animations/animation02.seq" - .global gGfxSeqAnimation03 gGfxSeqAnimation03: .incbin "graphics/animations/animation03.seq" - .global gGfxSeqAnimation04 gGfxSeqAnimation04: .incbin "graphics/animations/animation04.seq" - .global gGfxSeqAnimation05 gGfxSeqAnimation05: .incbin "graphics/animations/animation05.seq" - .global gGfxSeqAnimation06 gGfxSeqAnimation06: .incbin "graphics/animations/animation06.seq" - .global gGfxPixAnimationTileset02 gGfxPixAnimationTileset02: .incbin "graphics/animations/tileset02.pix" - .global gGfxSeqAnimation07 gGfxSeqAnimation07: .incbin "graphics/animations/animation07.seq" - .global gGfxSeqAnimation08 gGfxSeqAnimation08: .incbin "graphics/animations/animation08.seq" - .global gGfxSeqAnimation09 gGfxSeqAnimation09: .incbin "graphics/animations/animation09.seq" - .global gGfxSeqAnimation10 gGfxSeqAnimation10: .incbin "graphics/animations/animation10.seq" - .global gGfxSeqAnimation11 gGfxSeqAnimation11: .incbin "graphics/animations/animation11.seq" - .global gGfxSeqAnimation12 gGfxSeqAnimation12: .incbin "graphics/animations/animation12.seq" - .global gGfxSeqAnimation13 gGfxSeqAnimation13: .incbin "graphics/animations/animation13.seq" - .global gGfxSeqAnimation14 gGfxSeqAnimation14: .incbin "graphics/animations/animation14.seq" - .global gGfxSeqAnimation15 gGfxSeqAnimation15: .incbin "graphics/animations/animation15.seq" - .global gGfxSeqAnimation16 gGfxSeqAnimation16: .incbin "graphics/animations/animation16.seq" - .global gGfxSeqAnimation17 gGfxSeqAnimation17: .incbin "graphics/animations/animation17.seq" - .global gGfxSeqAnimation18 gGfxSeqAnimation18: .incbin "graphics/animations/animation18.seq" - .global gGfxSeqAnimation19 gGfxSeqAnimation19: .incbin "graphics/animations/animation19.seq" - .global gGfxSeqAnimation20 gGfxSeqAnimation20: .incbin "graphics/animations/animation20.seq" - .global gGfxSeqAnimation21 gGfxSeqAnimation21: .incbin "graphics/animations/animation21.seq" - .global gGfxSeqAnimation22 gGfxSeqAnimation22: .incbin "graphics/animations/animation22.seq" - .global gGfxSeqAnimation23 gGfxSeqAnimation23: .incbin "graphics/animations/animation23.seq" - .global gGfxSeqAnimation24 gGfxSeqAnimation24: .incbin "graphics/animations/animation24.seq" - .global gGfxSeqAnimation25 gGfxSeqAnimation25: .incbin "graphics/animations/animation25.seq" - .global gGfxSeqAnimation26 gGfxSeqAnimation26: .incbin "graphics/animations/animation26.seq" - .global gGfxSeqAnimation27 gGfxSeqAnimation27: .incbin "graphics/animations/animation27.seq" - .global gGfxSeqAnimation28 gGfxSeqAnimation28: .incbin "graphics/animations/animation28.seq" - .global gGfxSeqAnimation29 gGfxSeqAnimation29: .incbin "graphics/animations/animation29.seq" - .global gGfxSeqAnimation30 gGfxSeqAnimation30: .incbin "graphics/animations/animation30.seq" - .global gGfxSeqAnimation31 gGfxSeqAnimation31: .incbin "graphics/animations/animation31.seq" - .global gGfxSeqAnimation32 gGfxSeqAnimation32: .incbin "graphics/animations/animation32.seq" - .global gGfxSeqAnimation33 gGfxSeqAnimation33: .incbin "graphics/animations/animation33.seq" - .global gGfxSeqAnimation34 gGfxSeqAnimation34: .incbin "graphics/animations/animation34.seq" - .global gGfxSeqAnimation35 gGfxSeqAnimation35: .incbin "graphics/animations/animation35.seq" - .global gGfxSeqAnimation36 gGfxSeqAnimation36: .incbin "graphics/animations/animation36.seq" - .global gGfxSeqAnimation37 gGfxSeqAnimation37: .incbin "graphics/animations/animation37.seq" - .global gGfxSeqAnimation38 gGfxSeqAnimation38: .incbin "graphics/animations/animation38.seq" - .global gGfxSeqAnimation39 gGfxSeqAnimation39: .incbin "graphics/animations/animation39.seq" - .global gGfxSeqAnimation40 gGfxSeqAnimation40: .incbin "graphics/animations/animation40.seq" - .global gGfxSeqAnimation41 gGfxSeqAnimation41: .incbin "graphics/animations/animation41.seq" - .global gGfxSeqAnimation42 gGfxSeqAnimation42: .incbin "graphics/animations/animation42.seq" - .global gGfxSeqAnimation43 gGfxSeqAnimation43: .incbin "graphics/animations/animation43.seq" - .global gGfxSeqAnimation44 gGfxSeqAnimation44: .incbin "graphics/animations/animation44.seq" - .global gGfxSeqAnimation45 gGfxSeqAnimation45: .incbin "graphics/animations/animation45.seq" - .global gGfxSeqAnimation46 gGfxSeqAnimation46: .incbin "graphics/animations/animation46.seq" - .global gGfxSeqAnimation47 gGfxSeqAnimation47: .incbin "graphics/animations/animation47.seq" - .global gGfxSeqAnimation48 gGfxSeqAnimation48: .incbin "graphics/animations/animation48.seq" - .global gGfxSeqAnimation49 gGfxSeqAnimation49: .incbin "graphics/animations/animation49.seq" - .global gGfxSeqAnimation50 gGfxSeqAnimation50: .incbin "graphics/animations/animation50.seq" - .global gGfxSeqAnimation51 gGfxSeqAnimation51: .incbin "graphics/animations/animation51.seq" - .global gGfxSeqAnimation52 gGfxSeqAnimation52: .incbin "graphics/animations/animation52.seq" - .global gGfxSeqAnimation53 gGfxSeqAnimation53: .incbin "graphics/animations/animation53.seq" - .global gGfxSeqAnimation54 gGfxSeqAnimation54: .incbin "graphics/animations/animation54.seq" From d8aaaab2fedaf9db885c41a43d8cddbe7b94d157 Mon Sep 17 00:00:00 2001 From: Missingmew Date: Sat, 2 Sep 2023 23:43:36 +0200 Subject: [PATCH 10/17] name examination data --- include/investigation.h | 152 ++++++++++++++++---------------- src/investigation_segment_1_0.c | 26 +++--- src/investigation_segment_1_2.c | 34 +++---- src/investigation_segment_2_0.c | 28 +++--- src/investigation_segment_2_2.c | 82 ++++++++--------- src/investigation_segment_2_4.c | 40 ++++----- src/investigation_segment_3_0.c | 36 ++++---- src/investigation_segment_3_2.c | 44 ++++----- src/investigation_segment_3_4.c | 36 ++++---- 9 files changed, 239 insertions(+), 239 deletions(-) diff --git a/include/investigation.h b/include/investigation.h index 0297f68..158fde5 100644 --- a/include/investigation.h +++ b/include/investigation.h @@ -62,23 +62,23 @@ extern const struct CourtPresentData gCourtPresentData_1_3[14]; extern const struct InvestigationPresentData gInvestigationPresentData_1_0[17]; extern const struct TalkData gTalkData_1_0[14]; extern const u8 gRoomData_1_0[6][8]; -extern const struct ExaminationData gUnknown_08015100[6]; -extern const struct ExaminationData gUnknown_08015178[5]; -extern const struct ExaminationData gUnknown_080151DC[11]; -extern const struct ExaminationData gUnknown_080152B8[2]; -extern const struct ExaminationData gUnknown_080152E0[5]; -extern const struct ExaminationData gUnknown_08015344[6]; +extern const struct ExaminationData gExaminationData_1_0_00[6]; +extern const struct ExaminationData gExaminationData_1_0_01[5]; +extern const struct ExaminationData gExaminationData_1_0_02[11]; +extern const struct ExaminationData gExaminationData_1_0_03[2]; +extern const struct ExaminationData gExaminationData_1_0_04[5]; +extern const struct ExaminationData gExaminationData_1_0_05[6]; extern const struct InvestigationPresentData gInvestigationPresentData_1_2[12]; extern const struct TalkData gTalkData_1_2[13]; extern const u8 gRoomData_1_2[6][8]; -extern const struct ExaminationData gUnknown_08015550[5]; -extern const struct ExaminationData gUnknown_080155B4[5]; -extern const struct ExaminationData gUnknown_08015618[2]; -extern const struct ExaminationData gUnknown_08015640[6]; -extern const struct ExaminationData gUnknown_080156B8[5]; -extern const struct ExaminationData gUnknown_0801571C[5]; -extern const struct ExaminationData gUnknown_08015780[6]; -extern const struct ExaminationData gUnknown_080157F8[6]; +extern const struct ExaminationData gExaminationData_1_2_00[5]; +extern const struct ExaminationData gExaminationData_1_2_01[5]; +extern const struct ExaminationData gExaminationData_1_2_02[2]; +extern const struct ExaminationData gExaminationData_1_2_03[6]; +extern const struct ExaminationData gExaminationData_1_2_04[5]; +extern const struct ExaminationData gExaminationData_1_2_05[5]; +extern const struct ExaminationData gExaminationData_1_2_06[6]; +extern const struct ExaminationData gExaminationData_1_2_07[6]; extern const u8 gCourtRecordInitialItems_2_0[6]; extern const u8 gCourtRecordInitialItems_2_1[14]; extern const u8 gCourtRecordInitialItems_2_2[15]; @@ -92,45 +92,45 @@ extern const struct CourtPresentData gCourtPresentData_2_5[10]; extern const struct InvestigationPresentData gInvestigationPresentData_2_0[11]; extern const struct TalkData gTalkData_2_0[17]; extern const u8 gRoomData_2_0[12][8]; -extern const struct ExaminationData gUnknown_08015BD0[5]; -extern const struct ExaminationData gUnknown_08015C34[2]; -extern const struct ExaminationData gUnknown_08015C5C[5]; -extern const struct ExaminationData gUnknown_08015CC0[10]; -extern const struct ExaminationData gUnknown_08015D88[7]; -extern const struct ExaminationData gUnknown_08015E14[6]; -extern const struct ExaminationData gUnknown_08015E8C[6]; +extern const struct ExaminationData gExaminationData_2_0_00[5]; +extern const struct ExaminationData gExaminationData_2_0_01[2]; +extern const struct ExaminationData gExaminationData_2_0_02[5]; +extern const struct ExaminationData gExaminationData_2_0_03[10]; +extern const struct ExaminationData gExaminationData_2_0_04[7]; +extern const struct ExaminationData gExaminationData_2_0_05[6]; +extern const struct ExaminationData gExaminationData_2_0_06[6]; extern const struct InvestigationPresentData gInvestigationPresentData_2_2[36]; extern const struct TalkData gTalkData_2_2[18]; extern const u8 gRoomData_2_2[14][8]; -extern const struct ExaminationData gUnknown_080161FC[5]; -extern const struct ExaminationData gUnknown_08016260[5]; -extern const struct ExaminationData gUnknown_080162C4[2]; -extern const struct ExaminationData gUnknown_080162EC[5]; -extern const struct ExaminationData gUnknown_08016350[5]; -extern const struct ExaminationData gUnknown_080163B4[10]; -extern const struct ExaminationData gUnknown_0801647C[10]; -extern const struct ExaminationData gUnknown_08016544[7]; -extern const struct ExaminationData gUnknown_080165D0[7]; -extern const struct ExaminationData gUnknown_0801665C[6]; -extern const struct ExaminationData gUnknown_080166D4[6]; -extern const struct ExaminationData gUnknown_0801674C[6]; -extern const struct ExaminationData gUnknown_080167C4[6]; -extern const struct ExaminationData gUnknown_0801683C[9]; -extern const struct ExaminationData gUnknown_080168F0[9]; -extern const struct ExaminationData gUnknown_080169A4[7]; -extern const struct ExaminationData gUnknown_08016A30[7]; +extern const struct ExaminationData gExaminationData_2_2_00[5]; +extern const struct ExaminationData gExaminationData_2_2_01[5]; +extern const struct ExaminationData gExaminationData_2_2_02[2]; +extern const struct ExaminationData gExaminationData_2_2_03[5]; +extern const struct ExaminationData gExaminationData_2_2_04[5]; +extern const struct ExaminationData gExaminationData_2_2_05[10]; +extern const struct ExaminationData gExaminationData_2_2_06[10]; +extern const struct ExaminationData gExaminationData_2_2_07[7]; +extern const struct ExaminationData gExaminationData_2_2_08[7]; +extern const struct ExaminationData gExaminationData_2_2_09[6]; +extern const struct ExaminationData gExaminationData_2_2_10[6]; +extern const struct ExaminationData gExaminationData_2_2_11[6]; +extern const struct ExaminationData gExaminationData_2_2_12[6]; +extern const struct ExaminationData gExaminationData_2_2_13[9]; +extern const struct ExaminationData gExaminationData_2_2_14[9]; +extern const struct ExaminationData gExaminationData_2_2_15[7]; +extern const struct ExaminationData gExaminationData_2_2_16[7]; extern const struct InvestigationPresentData gInvestigationPresentData_2_4[22]; extern const struct TalkData gTalkData_2_4[13]; extern const u8 gRoomData_2_4[14][8]; -extern const struct ExaminationData gUnknown_08016CE0[5]; -extern const struct ExaminationData gUnknown_08016D44[2]; -extern const struct ExaminationData gUnknown_08016D6C[5]; -extern const struct ExaminationData gUnknown_08016DD0[10]; -extern const struct ExaminationData gUnknown_08016E98[7]; -extern const struct ExaminationData gUnknown_08016F24[7]; -extern const struct ExaminationData gUnknown_08016FB0[6]; -extern const struct ExaminationData gUnknown_08017028[9]; -extern const struct ExaminationData gUnknown_080170DC[7]; +extern const struct ExaminationData gExaminationData_2_4_00[5]; +extern const struct ExaminationData gExaminationData_2_4_01[2]; +extern const struct ExaminationData gExaminationData_2_4_02[5]; +extern const struct ExaminationData gExaminationData_2_4_03[10]; +extern const struct ExaminationData gExaminationData_2_4_04[7]; +extern const struct ExaminationData gExaminationData_2_4_05[7]; +extern const struct ExaminationData gExaminationData_2_4_06[6]; +extern const struct ExaminationData gExaminationData_2_4_07[9]; +extern const struct ExaminationData gExaminationData_2_4_08[7]; extern const u8 gCourtRecordInitialItems_3_0[6]; extern const u8 gCourtRecordInitialItems_3_1[17]; extern const u8 gCourtRecordInitialItems_3_2[22]; @@ -144,41 +144,41 @@ extern const struct CourtPresentData gCourtPresentData_3_5[10]; extern const struct InvestigationPresentData gInvestigationPresentData_3_0[25]; extern const struct TalkData gTalkData_3_0[24]; extern const u8 gRoomData_3_0[21][8]; -extern const struct ExaminationData gUnknown_08017638[5]; -extern const struct ExaminationData gUnknown_0801769C[2]; -extern const struct ExaminationData gUnknown_080176C4[4]; -extern const struct ExaminationData gUnknown_08017714[7]; -extern const struct ExaminationData gUnknown_080177A0[6]; -extern const struct ExaminationData gUnknown_08017818[7]; -extern const struct ExaminationData gUnknown_080178A4[3]; -extern const struct ExaminationData gUnknown_080178E0[6]; -extern const struct ExaminationData gUnknown_08017958[5]; +extern const struct ExaminationData gExaminationData_3_0_00[5]; +extern const struct ExaminationData gExaminationData_3_0_01[2]; +extern const struct ExaminationData gExaminationData_3_0_02[4]; +extern const struct ExaminationData gExaminationData_3_0_03[7]; +extern const struct ExaminationData gExaminationData_3_0_04[6]; +extern const struct ExaminationData gExaminationData_3_0_05[7]; +extern const struct ExaminationData gExaminationData_3_0_06[3]; +extern const struct ExaminationData gExaminationData_3_0_07[6]; +extern const struct ExaminationData gExaminationData_3_0_08[5]; extern const struct InvestigationPresentData gInvestigationPresentData_3_2[45]; extern const struct TalkData gTalkData_3_2[18]; extern const u8 gRoomData_3_2[21][8]; -extern const struct ExaminationData gUnknown_08017D34[5]; -extern const struct ExaminationData gUnknown_08017D98[2]; -extern const struct ExaminationData gUnknown_08017DC0[4]; -extern const struct ExaminationData gUnknown_08017E10[6]; -extern const struct ExaminationData gUnknown_08017E88[11]; -extern const struct ExaminationData gUnknown_08017F64[7]; -extern const struct ExaminationData gUnknown_08017FF0[3]; -extern const struct ExaminationData gUnknown_0801802C[7]; -extern const struct ExaminationData gUnknown_080180B8[6]; -extern const struct ExaminationData gUnknown_08018130[4]; -extern const struct ExaminationData gUnknown_08018180[5]; +extern const struct ExaminationData gExaminationData_3_2_00[5]; +extern const struct ExaminationData gExaminationData_3_2_01[2]; +extern const struct ExaminationData gExaminationData_3_2_02[4]; +extern const struct ExaminationData gExaminationData_3_2_03[6]; +extern const struct ExaminationData gExaminationData_3_2_04[11]; +extern const struct ExaminationData gExaminationData_3_2_05[7]; +extern const struct ExaminationData gExaminationData_3_2_06[3]; +extern const struct ExaminationData gExaminationData_3_2_07[7]; +extern const struct ExaminationData gExaminationData_3_2_08[6]; +extern const struct ExaminationData gExaminationData_3_2_09[4]; +extern const struct ExaminationData gExaminationData_3_2_10[5]; extern const struct InvestigationPresentData gInvestigationPresentData_3_4[13]; extern const struct TalkData gTalkData_3_4[12]; extern const u8 gRoomData_3_4[21][8]; -extern const struct ExaminationData gUnknown_080183E4[5]; -extern const struct ExaminationData gUnknown_08018448[2]; -extern const struct ExaminationData gUnknown_08018470[4]; -extern const struct ExaminationData gUnknown_080184C0[6]; -extern const struct ExaminationData gUnknown_08018538[3]; -extern const struct ExaminationData gUnknown_08018574[7]; -extern const struct ExaminationData gUnknown_08018600[6]; -extern const struct ExaminationData gUnknown_08018678[5]; -extern const struct ExaminationData gUnknown_080186DC[5]; +extern const struct ExaminationData gExaminationData_3_4_00[5]; +extern const struct ExaminationData gExaminationData_3_4_01[2]; +extern const struct ExaminationData gExaminationData_3_4_02[4]; +extern const struct ExaminationData gExaminationData_3_4_03[6]; +extern const struct ExaminationData gExaminationData_3_4_04[3]; +extern const struct ExaminationData gExaminationData_3_4_05[7]; +extern const struct ExaminationData gExaminationData_3_4_06[6]; +extern const struct ExaminationData gExaminationData_3_4_07[5]; +extern const struct ExaminationData gExaminationData_3_4_08[5]; /* end data stuff from segments */ void SetInactiveActionButtons(struct InvestigationStruct *, u32); diff --git a/src/investigation_segment_1_0.c b/src/investigation_segment_1_0.c index 0bb0bdd..516cba6 100644 --- a/src/investigation_segment_1_0.c +++ b/src/investigation_segment_1_0.c @@ -612,7 +612,7 @@ const u8 gRoomData_1_0[6][8] = { }; // exam data -const struct ExaminationData gUnknown_08015100[6] = { +const struct ExaminationData gExaminationData_1_0_00[6] = { { .examinationSection = 0x87, .type = 0x0, @@ -681,7 +681,7 @@ const struct ExaminationData gUnknown_08015100[6] = { }, }; -const struct ExaminationData gUnknown_08015178[5] = { +const struct ExaminationData gExaminationData_1_0_01[5] = { { .examinationSection = 0x9B, .type = 0x0, @@ -739,7 +739,7 @@ const struct ExaminationData gUnknown_08015178[5] = { }, }; -const struct ExaminationData gUnknown_080151DC[11] = { +const struct ExaminationData gExaminationData_1_0_02[11] = { { .examinationSection = 0xB6, .type = 0x0, @@ -863,7 +863,7 @@ const struct ExaminationData gUnknown_080151DC[11] = { }, }; -const struct ExaminationData gUnknown_080152B8[2] = { +const struct ExaminationData gExaminationData_1_0_03[2] = { { .examinationSection = 0xCB, .type = 0x0, @@ -888,7 +888,7 @@ const struct ExaminationData gUnknown_080152B8[2] = { }, }; -const struct ExaminationData gUnknown_080152E0[5] = { +const struct ExaminationData gExaminationData_1_0_04[5] = { { .examinationSection = 0xFE, .type = 0x0, @@ -946,7 +946,7 @@ const struct ExaminationData gUnknown_080152E0[5] = { }, }; -const struct ExaminationData gUnknown_08015344[6] = { +const struct ExaminationData gExaminationData_1_0_05[6] = { { .examinationSection = 0xED, .type = 0x0, @@ -1031,7 +1031,7 @@ void InvestigationRoomSetup_1_0(struct Main *main) if(!GetFlag(0, 0x4F)) { InvestigationSetScriptSectionAndFlag(0xB1, 0x4F); } - LOADEXAMDATA(gUnknown_08015178); + LOADEXAMDATA(gExaminationData_1_0_01); } else if(GetFlag(0, 0x48)) { if(!GetFlag(0, 0x4A)) { @@ -1041,7 +1041,7 @@ void InvestigationRoomSetup_1_0(struct Main *main) InvestigationSetPersonAnimation(PERSON_ANIM_GUMSHOE, ANIM_GUMSHOE_NORMAL_IDLE, ANIM_GUMSHOE_NORMAL_IDLE); PlayBGM(BGM025_INVESTIGATION_OPENING); } - LOADEXAMDATA(gUnknown_08015178); + LOADEXAMDATA(gExaminationData_1_0_01); } else if (GetFlag(0, 0x41)) { if(!GetFlag(0, 0x42)) { @@ -1056,7 +1056,7 @@ void InvestigationRoomSetup_1_0(struct Main *main) PlayBGM(BGM012_INVESTIGATION_CORE); } } - LOADEXAMDATA(gUnknown_08015100); + LOADEXAMDATA(gExaminationData_1_0_00); } else if(GetFlag(0, 0x3F)) { InvestigationSetScriptSectionAndFlag(0x82, 0x40); @@ -1074,7 +1074,7 @@ void InvestigationRoomSetup_1_0(struct Main *main) if(GetFlag(0, 0x49)) { PlayAnimation(ANIM_MAYA_NOTE); } - LOADEXAMDATA(gUnknown_080151DC); + LOADEXAMDATA(gExaminationData_1_0_02); break; } case 2: { @@ -1113,7 +1113,7 @@ void InvestigationRoomSetup_1_0(struct Main *main) InvestigationSetPersonAnimation(PERSON_ANIM_MAYA, ANIM_MAYA_DEJECTED_IDLE_CROPPED, ANIM_MAYA_DEJECTED_IDLE_CROPPED); PlayBGM(BGM000_DETENTION_CENTER); } - LOADEXAMDATA(gUnknown_080152B8); + LOADEXAMDATA(gExaminationData_1_0_03); break; } case 3: { @@ -1131,7 +1131,7 @@ void InvestigationRoomSetup_1_0(struct Main *main) else if(!GetFlag(0, 0x50)) { InvestigationSetScriptSectionAndFlag(0xFA, 0x50); } - LOADEXAMDATA(gUnknown_080152E0); + LOADEXAMDATA(gExaminationData_1_0_04); break; } case 5: { @@ -1152,7 +1152,7 @@ void InvestigationRoomSetup_1_0(struct Main *main) } PlayBGM(BGM022_HAPPY_PEOPLE); } - LOADEXAMDATA(gUnknown_08015344); + LOADEXAMDATA(gExaminationData_1_0_05); break; } } diff --git a/src/investigation_segment_1_2.c b/src/investigation_segment_1_2.c index 2cdabf1..cd9ae97 100644 --- a/src/investigation_segment_1_2.c +++ b/src/investigation_segment_1_2.c @@ -241,7 +241,7 @@ const u8 gRoomData_1_2[6][8] = { }; // exam data -const struct ExaminationData gUnknown_08015550[5] = { +const struct ExaminationData gExaminationData_1_2_00[5] = { { .examinationSection = 0x81, .type = 0x0, @@ -299,7 +299,7 @@ const struct ExaminationData gUnknown_08015550[5] = { }, }; -const struct ExaminationData gUnknown_080155B4[5] = { +const struct ExaminationData gExaminationData_1_2_01[5] = { { .examinationSection = 0x81, .type = 0x0, @@ -357,7 +357,7 @@ const struct ExaminationData gUnknown_080155B4[5] = { }, }; -const struct ExaminationData gUnknown_08015618[2] = { +const struct ExaminationData gExaminationData_1_2_02[2] = { { .examinationSection = 0x9B, .type = 0x0, @@ -382,7 +382,7 @@ const struct ExaminationData gUnknown_08015618[2] = { }, }; -const struct ExaminationData gUnknown_08015640[6] = { +const struct ExaminationData gExaminationData_1_2_03[6] = { { .examinationSection = 0xBD, .type = 0x0, @@ -451,7 +451,7 @@ const struct ExaminationData gUnknown_08015640[6] = { }, }; -const struct ExaminationData gUnknown_080156B8[5] = { +const struct ExaminationData gExaminationData_1_2_04[5] = { { .examinationSection = 0x11C, .type = 0x0, @@ -509,7 +509,7 @@ const struct ExaminationData gUnknown_080156B8[5] = { }, }; -const struct ExaminationData gUnknown_0801571C[5] = { +const struct ExaminationData gExaminationData_1_2_05[5] = { { .examinationSection = 0x131, .type = 0x0, @@ -567,7 +567,7 @@ const struct ExaminationData gUnknown_0801571C[5] = { }, }; -const struct ExaminationData gUnknown_08015780[6] = { +const struct ExaminationData gExaminationData_1_2_06[6] = { { .examinationSection = 0x101, .type = 0x0, @@ -636,7 +636,7 @@ const struct ExaminationData gUnknown_08015780[6] = { }, }; -const struct ExaminationData gUnknown_080157F8[6] = { +const struct ExaminationData gExaminationData_1_2_07[6] = { { .examinationSection = 0x101, .type = 0x0, @@ -721,7 +721,7 @@ void InvestigationRoomSetup_1_2(struct Main *main) if(!GetFlag(0, 0x7B)) { InvestigationSetScriptSectionAndFlag(0x80, 0x7B); } - LOADEXAMDATA(gUnknown_08015550); + LOADEXAMDATA(gExaminationData_1_2_00); } else { if(!GetFlag(0, 0x7C)) { @@ -733,12 +733,12 @@ void InvestigationRoomSetup_1_2(struct Main *main) else { PlayBGM(BGM025_INVESTIGATION_OPENING); } - LOADEXAMDATA(gUnknown_080155B4); + LOADEXAMDATA(gExaminationData_1_2_01); } break; } case 2: { - LOADEXAMDATA(gUnknown_08015618); + LOADEXAMDATA(gExaminationData_1_2_02); if(!GetFlag(0, 0x80)) { if(!GetFlag(0, 0x7D)) { InvestigationSetScriptSectionAndFlag(0x9A, 0x7D); @@ -763,7 +763,7 @@ void InvestigationRoomSetup_1_2(struct Main *main) break; } case 3: { - LOADEXAMDATA(gUnknown_08015640); + LOADEXAMDATA(gExaminationData_1_2_03); if(!GetFlag(0, 0x72)) { if(!GetFlag(0, 0x80)) { InvestigationSetScriptSectionAndFlag(0xB9, 0x80); @@ -807,7 +807,7 @@ void InvestigationRoomSetup_1_2(struct Main *main) InvestigationSetPersonAnimation(PERSON_ANIM_REDD_WHITE, ANIM_WHITE_CONFIDENT_IDLE, ANIM_WHITE_CONFIDENT_IDLE); PlayBGM(BGM012_INVESTIGATION_CORE); } - LOADEXAMDATA(gUnknown_080156B8); + LOADEXAMDATA(gExaminationData_1_2_04); } else { if(!GetFlag(0, 0x85)) { @@ -817,7 +817,7 @@ void InvestigationRoomSetup_1_2(struct Main *main) InvestigationSetPersonAnimation(PERSON_ANIM_REDD_WHITE, ANIM_WHITE_CONFIDENT_IDLE, ANIM_WHITE_CONFIDENT_IDLE); PlayBGM(BGM012_INVESTIGATION_CORE); } - LOADEXAMDATA(gUnknown_0801571C); + LOADEXAMDATA(gExaminationData_1_2_05); } break; } @@ -830,13 +830,13 @@ void InvestigationRoomSetup_1_2(struct Main *main) InvestigationSetPersonAnimation(PERSON_ANIM_BELLBOY, ANIM_BELLBOY_NORMAL_IDLE, ANIM_BELLBOY_NORMAL_IDLE); PlayBGM(BGM025_INVESTIGATION_OPENING); } - LOADEXAMDATA(gUnknown_08015780); + LOADEXAMDATA(gExaminationData_1_2_06); } else { if(!GetFlag(0, 0x87)) { InvestigationSetScriptSectionAndFlag(0x112, 0x87); } - LOADEXAMDATA(gUnknown_080157F8); + LOADEXAMDATA(gExaminationData_1_2_07); } break; @@ -848,7 +848,7 @@ void InvestigationRoomUpdate_1_2(struct Main *main) { if(main->currentRoomId == 4) { if(!GetFlag(0, 0x71) && GetFlag(0, 0x70)) { - LOADEXAMDATA(gUnknown_0801571C); + LOADEXAMDATA(gExaminationData_1_2_05); ChangeFlag(0, 0x71, 1); } } diff --git a/src/investigation_segment_2_0.c b/src/investigation_segment_2_0.c index 9f89b6d..079e0de 100644 --- a/src/investigation_segment_2_0.c +++ b/src/investigation_segment_2_0.c @@ -527,7 +527,7 @@ const u8 gRoomData_2_0[12][8] = { }; // exam data -const struct ExaminationData gUnknown_08015BD0[5] = { +const struct ExaminationData gExaminationData_2_0_00[5] = { { .examinationSection = 0x82, .type = 0x0, @@ -585,7 +585,7 @@ const struct ExaminationData gUnknown_08015BD0[5] = { }, }; -const struct ExaminationData gUnknown_08015C34[2] = { +const struct ExaminationData gExaminationData_2_0_01[2] = { { .examinationSection = 0x93, .type = 0x0, @@ -610,7 +610,7 @@ const struct ExaminationData gUnknown_08015C34[2] = { }, }; -const struct ExaminationData gUnknown_08015C5C[5] = { +const struct ExaminationData gExaminationData_2_0_02[5] = { { .examinationSection = 0xA4, .type = 0x0, @@ -668,7 +668,7 @@ const struct ExaminationData gUnknown_08015C5C[5] = { }, }; -const struct ExaminationData gUnknown_08015CC0[10] = { +const struct ExaminationData gExaminationData_2_0_03[10] = { { .examinationSection = 0xBF, .type = 0x0, @@ -781,7 +781,7 @@ const struct ExaminationData gUnknown_08015CC0[10] = { }, }; -const struct ExaminationData gUnknown_08015D88[7] = { +const struct ExaminationData gExaminationData_2_0_04[7] = { { .examinationSection = 0xCD, .type = 0x0, @@ -861,7 +861,7 @@ const struct ExaminationData gUnknown_08015D88[7] = { }, }; -const struct ExaminationData gUnknown_08015E14[6] = { +const struct ExaminationData gExaminationData_2_0_05[6] = { { .examinationSection = 0xD8, .type = 0x0, @@ -930,7 +930,7 @@ const struct ExaminationData gUnknown_08015E14[6] = { }, }; -const struct ExaminationData gUnknown_08015E8C[6] = { +const struct ExaminationData gExaminationData_2_0_06[6] = { { .examinationSection = 0xF1, .type = 0x0, @@ -1024,7 +1024,7 @@ void InvestigationRoomSetup_2_0(struct Main *main) InvestigationSetPersonAnimation(PERSON_ANIM_MAYA, ANIM_MAYA_NORMAL_IDLE, ANIM_MAYA_NORMAL_IDLE); PlayBGM(BGM006_MAYAS_THEME); } - LOADEXAMDATA(gUnknown_08015BD0); + LOADEXAMDATA(gExaminationData_2_0_00); break; } case 2: { @@ -1049,7 +1049,7 @@ void InvestigationRoomSetup_2_0(struct Main *main) InvestigationSetPersonAnimation(PERSON_ANIM_WILL_POWERS, ANIM_POWERS_NORMAL_IDLE_CROPPED, ANIM_POWERS_NORMAL_IDLE_CROPPED); PlayBGM(BGM000_DETENTION_CENTER); } - LOADEXAMDATA(gUnknown_08015C34); + LOADEXAMDATA(gExaminationData_2_0_01); break; } case 7: { @@ -1081,21 +1081,21 @@ void InvestigationRoomSetup_2_0(struct Main *main) InvestigationSetPersonAnimation(PERSON_ANIM_WENDY_OLDBAG, ANIM_OLDBAG_NORMAL_IDLE, ANIM_OLDBAG_NORMAL_IDLE); PlayBGM(BGM025_INVESTIGATION_OPENING); } - LOADEXAMDATA(gUnknown_08015C5C); + LOADEXAMDATA(gExaminationData_2_0_02); break; } case 8: { if(!GetFlag(0, 0x9D)) { InvestigationSetScriptSectionAndFlag(0xBE, 0x9D); } - LOADEXAMDATA(gUnknown_08015CC0); + LOADEXAMDATA(gExaminationData_2_0_03); break; } case 9: { if(!GetFlag(0, 0xA2)) { InvestigationSetScriptSectionAndFlag(0xC9, 0xA2); } - LOADEXAMDATA(gUnknown_08015D88); + LOADEXAMDATA(gExaminationData_2_0_04); break; } case 10: { @@ -1106,7 +1106,7 @@ void InvestigationRoomSetup_2_0(struct Main *main) InvestigationSetPersonAnimation(PERSON_ANIM_GUMSHOE, ANIM_GUMSHOE_NORMAL_IDLE, ANIM_GUMSHOE_NORMAL_IDLE); PlayBGM(BGM001_GUMSHOES_THEME); } - LOADEXAMDATA(gUnknown_08015E14); + LOADEXAMDATA(gExaminationData_2_0_05); break; } case 11: { @@ -1124,7 +1124,7 @@ void InvestigationRoomSetup_2_0(struct Main *main) } PlayBGM(BGM025_INVESTIGATION_OPENING); } - LOADEXAMDATA(gUnknown_08015E8C); + LOADEXAMDATA(gExaminationData_2_0_06); break; } } diff --git a/src/investigation_segment_2_2.c b/src/investigation_segment_2_2.c index 405606e..ca050c1 100644 --- a/src/investigation_segment_2_2.c +++ b/src/investigation_segment_2_2.c @@ -486,7 +486,7 @@ const u8 gRoomData_2_2[14][8] = { }; // exam data -const struct ExaminationData gUnknown_080161FC[5] = { +const struct ExaminationData gExaminationData_2_2_00[5] = { { .examinationSection = 0x81, .type = 0x0, @@ -544,7 +544,7 @@ const struct ExaminationData gUnknown_080161FC[5] = { }, }; -const struct ExaminationData gUnknown_08016260[5] = { +const struct ExaminationData gExaminationData_2_2_01[5] = { { .examinationSection = 0x8E, .type = 0x0, @@ -602,7 +602,7 @@ const struct ExaminationData gUnknown_08016260[5] = { }, }; -const struct ExaminationData gUnknown_080162C4[2] = { +const struct ExaminationData gExaminationData_2_2_02[2] = { { .examinationSection = 0x95, .type = 0x0, @@ -627,7 +627,7 @@ const struct ExaminationData gUnknown_080162C4[2] = { }, }; -const struct ExaminationData gUnknown_080162EC[5] = { +const struct ExaminationData gExaminationData_2_2_03[5] = { { .examinationSection = 0xA0, .type = 0x0, @@ -685,7 +685,7 @@ const struct ExaminationData gUnknown_080162EC[5] = { }, }; -const struct ExaminationData gUnknown_08016350[5] = { +const struct ExaminationData gExaminationData_2_2_04[5] = { { .examinationSection = 0xA0, .type = 0x0, @@ -743,7 +743,7 @@ const struct ExaminationData gUnknown_08016350[5] = { }, }; -const struct ExaminationData gUnknown_080163B4[10] = { +const struct ExaminationData gExaminationData_2_2_05[10] = { { .examinationSection = 0xC0, .type = 0x0, @@ -856,7 +856,7 @@ const struct ExaminationData gUnknown_080163B4[10] = { }, }; -const struct ExaminationData gUnknown_0801647C[10] = { +const struct ExaminationData gExaminationData_2_2_06[10] = { { .examinationSection = 0xD5, .type = 0x0, @@ -969,7 +969,7 @@ const struct ExaminationData gUnknown_0801647C[10] = { }, }; -const struct ExaminationData gUnknown_08016544[7] = { +const struct ExaminationData gExaminationData_2_2_07[7] = { { .examinationSection = 0xDE, .type = 0x0, @@ -1049,7 +1049,7 @@ const struct ExaminationData gUnknown_08016544[7] = { }, }; -const struct ExaminationData gUnknown_080165D0[7] = { +const struct ExaminationData gExaminationData_2_2_08[7] = { { .examinationSection = 0xED, .type = 0x0, @@ -1129,7 +1129,7 @@ const struct ExaminationData gUnknown_080165D0[7] = { }, }; -const struct ExaminationData gUnknown_0801665C[6] = { +const struct ExaminationData gExaminationData_2_2_09[6] = { { .examinationSection = 0x107, .type = 0x0, @@ -1198,7 +1198,7 @@ const struct ExaminationData gUnknown_0801665C[6] = { }, }; -const struct ExaminationData gUnknown_080166D4[6] = { +const struct ExaminationData gExaminationData_2_2_10[6] = { { .examinationSection = 0x107, .type = 0x0, @@ -1267,7 +1267,7 @@ const struct ExaminationData gUnknown_080166D4[6] = { }, }; -const struct ExaminationData gUnknown_0801674C[6] = { +const struct ExaminationData gExaminationData_2_2_11[6] = { { .examinationSection = 0x111, .type = 0x0, @@ -1336,7 +1336,7 @@ const struct ExaminationData gUnknown_0801674C[6] = { }, }; -const struct ExaminationData gUnknown_080167C4[6] = { +const struct ExaminationData gExaminationData_2_2_12[6] = { { .examinationSection = 0x119, .type = 0x0, @@ -1405,7 +1405,7 @@ const struct ExaminationData gUnknown_080167C4[6] = { }, }; -const struct ExaminationData gUnknown_0801683C[9] = { +const struct ExaminationData gExaminationData_2_2_13[9] = { { .examinationSection = 0x11F, .type = 0x0, @@ -1507,7 +1507,7 @@ const struct ExaminationData gUnknown_0801683C[9] = { }, }; -const struct ExaminationData gUnknown_080168F0[9] = { +const struct ExaminationData gExaminationData_2_2_14[9] = { { .examinationSection = 0x12C, .type = 0x0, @@ -1609,7 +1609,7 @@ const struct ExaminationData gUnknown_080168F0[9] = { }, }; -const struct ExaminationData gUnknown_080169A4[7] = { +const struct ExaminationData gExaminationData_2_2_15[7] = { { .examinationSection = 0x13A, .type = 0x0, @@ -1689,7 +1689,7 @@ const struct ExaminationData gUnknown_080169A4[7] = { }, }; -const struct ExaminationData gUnknown_08016A30[7] = { +const struct ExaminationData gExaminationData_2_2_16[7] = { { .examinationSection = 0x13A, .type = 0x0, @@ -1789,14 +1789,14 @@ void InvestigationRoomSetup_2_2(struct Main *main) InvestigationSetPersonAnimation(PERSON_ANIM_SUMMONED_MIA, ANIM_SUMMONED_MIA_NORMAL_IDLE, ANIM_SUMMONED_MIA_NORMAL_IDLE); PlayBGM(BGM012_INVESTIGATION_CORE); } - LOADEXAMDATA(gUnknown_08016260); + LOADEXAMDATA(gExaminationData_2_2_01); } else { if(GetFlag(0, 0xB0)) { InvestigationSetPersonAnimation(PERSON_ANIM_MAYA, ANIM_MAYA_NORMAL_IDLE, ANIM_MAYA_NORMAL_IDLE); PlayBGM(BGM006_MAYAS_THEME); } - LOADEXAMDATA(gUnknown_080161FC); + LOADEXAMDATA(gExaminationData_2_2_00); } break; } @@ -1813,7 +1813,7 @@ void InvestigationRoomSetup_2_2(struct Main *main) InvestigationSetPersonAnimation(PERSON_ANIM_WILL_POWERS, ANIM_POWERS_NORMAL_IDLE_CROPPED, ANIM_POWERS_NORMAL_IDLE_CROPPED); PlayBGM(BGM000_DETENTION_CENTER); } - LOADEXAMDATA(gUnknown_080162C4); + LOADEXAMDATA(gExaminationData_2_2_02); break; } case 7: { @@ -1828,7 +1828,7 @@ void InvestigationRoomSetup_2_2(struct Main *main) else { PlayBGM(BGM031_AMBIENT_BIRD_CHIRPS); } - LOADEXAMDATA(gUnknown_080162EC); + LOADEXAMDATA(gExaminationData_2_2_03); } else if(GetFlag(0, 0xC1)) { if(!GetFlag(0, 0xC2)) { @@ -1837,7 +1837,7 @@ void InvestigationRoomSetup_2_2(struct Main *main) else { PlayBGM(BGM031_AMBIENT_BIRD_CHIRPS); } - LOADEXAMDATA(gUnknown_08016350); + LOADEXAMDATA(gExaminationData_2_2_04); } else if(GetFlag(0, 0xBB) && GetFlag(0, 0xBC)) { if(!GetFlag(0, 0xBD)) { @@ -1847,7 +1847,7 @@ void InvestigationRoomSetup_2_2(struct Main *main) InvestigationSetPersonAnimation(PERSON_ANIM_WENDY_OLDBAG, ANIM_OLDBAG_NORMAL_IDLE, ANIM_OLDBAG_NORMAL_IDLE); PlayBGM(BGM025_INVESTIGATION_OPENING); } - LOADEXAMDATA(gUnknown_080162EC); + LOADEXAMDATA(gExaminationData_2_2_03); } else if(GetFlag(0, 0xB8)) { if(!GetFlag(0, 0xB9)) { @@ -1857,7 +1857,7 @@ void InvestigationRoomSetup_2_2(struct Main *main) InvestigationSetPersonAnimation(PERSON_ANIM_PENNY_NICHOLS, ANIM_NICHOLS_NORMAL_IDLE, ANIM_NICHOLS_NORMAL_IDLE); PlayBGM(BGM025_INVESTIGATION_OPENING); } - LOADEXAMDATA(gUnknown_080162EC); + LOADEXAMDATA(gExaminationData_2_2_03); } else { if(!GetFlag(0, 0xB2)) { @@ -1866,7 +1866,7 @@ void InvestigationRoomSetup_2_2(struct Main *main) else { PlayBGM(BGM031_AMBIENT_BIRD_CHIRPS); } - LOADEXAMDATA(gUnknown_080162EC); + LOADEXAMDATA(gExaminationData_2_2_03); } break; } @@ -1875,7 +1875,7 @@ void InvestigationRoomSetup_2_2(struct Main *main) if(!GetFlag(0, 0xCE)) { InvestigationSetScriptSectionAndFlag(0xD4, 0xCE); } - LOADEXAMDATA(gUnknown_0801647C); + LOADEXAMDATA(gExaminationData_2_2_06); } else if(GetFlag(0, 0xBD)) { if(!GetFlag(0, 0xBE)) { @@ -1890,7 +1890,7 @@ void InvestigationRoomSetup_2_2(struct Main *main) SetInactiveActionButtons(&gInvestigation, 0xF); PlayBGM(BGM021_STEEL_SAMURAI_THEME); } - LOADEXAMDATA(gUnknown_080163B4); + LOADEXAMDATA(gExaminationData_2_2_05); } else { if(!GetFlag(0, 0xB8)) { @@ -1899,7 +1899,7 @@ void InvestigationRoomSetup_2_2(struct Main *main) if(!GetFlag(0, 0xB3)) { InvestigationSetScriptSectionAndFlag(0xBF, 0xB3); } - LOADEXAMDATA(gUnknown_080163B4); + LOADEXAMDATA(gExaminationData_2_2_05); } break; } @@ -1912,7 +1912,7 @@ void InvestigationRoomSetup_2_2(struct Main *main) InvestigationSetPersonAnimation(PERSON_ANIM_CODY_HACKINS, ANIM_HACKINS_CAMERA_IDLE, ANIM_HACKINS_CAMERA_IDLE); PlayBGM(BGM021_STEEL_SAMURAI_THEME); } - LOADEXAMDATA(gUnknown_080165D0); + LOADEXAMDATA(gExaminationData_2_2_08); } else if(GetFlag(0, 0xBA)) { if(!GetFlag(0, 0xBB)) { @@ -1922,7 +1922,7 @@ void InvestigationRoomSetup_2_2(struct Main *main) InvestigationSetPersonAnimation(PERSON_ANIM_SAL_MANELLA, ANIM_MANELLA_NORMAL_IDLE, ANIM_MANELLA_NORMAL_IDLE); PlayBGM(BGM021_STEEL_SAMURAI_THEME); } - LOADEXAMDATA(gUnknown_08016544); + LOADEXAMDATA(gExaminationData_2_2_07); } else { if(!GetFlag(0, 0xB4)) { @@ -1931,7 +1931,7 @@ void InvestigationRoomSetup_2_2(struct Main *main) else { PlayBGM(BGM025_INVESTIGATION_OPENING); } - LOADEXAMDATA(gUnknown_08016544); + LOADEXAMDATA(gExaminationData_2_2_07); } break; } @@ -1943,7 +1943,7 @@ void InvestigationRoomSetup_2_2(struct Main *main) else { PlayBGM(BGM031_AMBIENT_BIRD_CHIRPS); } - LOADEXAMDATA(gUnknown_080166D4); + LOADEXAMDATA(gExaminationData_2_2_10); } else { if(!GetFlag(0, 0xB5)) { @@ -1952,13 +1952,13 @@ void InvestigationRoomSetup_2_2(struct Main *main) else { PlayBGM(BGM031_AMBIENT_BIRD_CHIRPS); } - LOADEXAMDATA(gUnknown_0801665C); + LOADEXAMDATA(gExaminationData_2_2_09); } break; } case 11: { if(GetFlag(0, 0xCC)) { - LOADEXAMDATA(gUnknown_080167C4); + LOADEXAMDATA(gExaminationData_2_2_12); } else { if(GetFlag(0, 0xC7)) { @@ -1969,14 +1969,14 @@ void InvestigationRoomSetup_2_2(struct Main *main) else if(!GetFlag(0, 0xB6)) { InvestigationSetScriptSectionAndFlag(0x10F, 0xB6); } - LOADEXAMDATA(gUnknown_0801674C); + LOADEXAMDATA(gExaminationData_2_2_11); } break; } case 12: { if(GetFlag(0, 0xCC)) { PlayBGM(BGM031_AMBIENT_BIRD_CHIRPS); - LOADEXAMDATA(gUnknown_080168F0); + LOADEXAMDATA(gExaminationData_2_2_14); } else if(GetFlag(0, 0xB8)) { if(!GetFlag(0, 0xDA)) { @@ -1985,7 +1985,7 @@ void InvestigationRoomSetup_2_2(struct Main *main) else { PlayBGM(BGM031_AMBIENT_BIRD_CHIRPS); } - LOADEXAMDATA(gUnknown_0801683C); + LOADEXAMDATA(gExaminationData_2_2_13); } else { if(!GetFlag(0, 0xB7)) { @@ -1994,7 +1994,7 @@ void InvestigationRoomSetup_2_2(struct Main *main) else { PlayBGM(BGM031_AMBIENT_BIRD_CHIRPS); } - LOADEXAMDATA(gUnknown_0801683C); + LOADEXAMDATA(gExaminationData_2_2_13); } break; } @@ -2006,10 +2006,10 @@ void InvestigationRoomSetup_2_2(struct Main *main) else if(!GetFlag(0, 0xD1)) { InvestigationSetPersonAnimation(PERSON_ANIM_PENNY_NICHOLS, ANIM_NICHOLS_NORMAL_IDLE, ANIM_NICHOLS_NORMAL_IDLE); } - LOADEXAMDATA(gUnknown_08016A30); + LOADEXAMDATA(gExaminationData_2_2_16); } else if(GetFlag(0, 0xCC)) { - LOADEXAMDATA(gUnknown_08016A30); + LOADEXAMDATA(gExaminationData_2_2_16); } else { if(!GetFlag(0, 0xC5)) { @@ -2018,7 +2018,7 @@ void InvestigationRoomSetup_2_2(struct Main *main) else if(!GetFlag(0, 0xCB)) { InvestigationSetPersonAnimation(PERSON_ANIM_DEE_VASQUEZ, ANIM_VASQUEZ_NORMAL_IDLE, ANIM_VASQUEZ_NORMAL_IDLE); } - LOADEXAMDATA(gUnknown_080169A4); + LOADEXAMDATA(gExaminationData_2_2_15); } break; } diff --git a/src/investigation_segment_2_4.c b/src/investigation_segment_2_4.c index 2ca7c4a..536edae 100644 --- a/src/investigation_segment_2_4.c +++ b/src/investigation_segment_2_4.c @@ -328,7 +328,7 @@ const u8 gRoomData_2_4[14][8] = { }; // exam data -const struct ExaminationData gUnknown_08016CE0[5] = { +const struct ExaminationData gExaminationData_2_4_00[5] = { { .examinationSection = 0x81, .type = 0x0, @@ -386,7 +386,7 @@ const struct ExaminationData gUnknown_08016CE0[5] = { }, }; -const struct ExaminationData gUnknown_08016D44[2] = { +const struct ExaminationData gExaminationData_2_4_01[2] = { { .examinationSection = 0x90, .type = 0x0, @@ -411,7 +411,7 @@ const struct ExaminationData gUnknown_08016D44[2] = { }, }; -const struct ExaminationData gUnknown_08016D6C[5] = { +const struct ExaminationData gExaminationData_2_4_02[5] = { { .examinationSection = 0x9A, .type = 0x0, @@ -469,7 +469,7 @@ const struct ExaminationData gUnknown_08016D6C[5] = { }, }; -const struct ExaminationData gUnknown_08016DD0[10] = { +const struct ExaminationData gExaminationData_2_4_03[10] = { { .examinationSection = 0xB5, .type = 0x0, @@ -582,7 +582,7 @@ const struct ExaminationData gUnknown_08016DD0[10] = { }, }; -const struct ExaminationData gUnknown_08016E98[7] = { +const struct ExaminationData gExaminationData_2_4_04[7] = { { .examinationSection = 0xC8, .type = 0x0, @@ -662,7 +662,7 @@ const struct ExaminationData gUnknown_08016E98[7] = { }, }; -const struct ExaminationData gUnknown_08016F24[7] = { +const struct ExaminationData gExaminationData_2_4_05[7] = { { .examinationSection = 0xCE, .type = 0x0, @@ -742,7 +742,7 @@ const struct ExaminationData gUnknown_08016F24[7] = { }, }; -const struct ExaminationData gUnknown_08016FB0[6] = { +const struct ExaminationData gExaminationData_2_4_06[6] = { { .examinationSection = 0xE4, .type = 0x0, @@ -811,7 +811,7 @@ const struct ExaminationData gUnknown_08016FB0[6] = { }, }; -const struct ExaminationData gUnknown_08017028[9] = { +const struct ExaminationData gExaminationData_2_4_07[9] = { { .examinationSection = 0xE8, .type = 0x0, @@ -913,7 +913,7 @@ const struct ExaminationData gUnknown_08017028[9] = { }, }; -const struct ExaminationData gUnknown_080170DC[7] = { +const struct ExaminationData gExaminationData_2_4_08[7] = { { .examinationSection = 0xFC, .type = 0x0, @@ -1009,7 +1009,7 @@ void InvestigationRoomSetup_2_4(struct Main *main) InvestigationSetPersonAnimation(PERSON_ANIM_MAYA, ANIM_MAYA_NORMAL_IDLE, ANIM_MAYA_NORMAL_IDLE); PlayBGM(BGM006_MAYAS_THEME); } - LOADEXAMDATA(gUnknown_08016CE0); + LOADEXAMDATA(gExaminationData_2_4_00); break; } case 2: { @@ -1020,7 +1020,7 @@ void InvestigationRoomSetup_2_4(struct Main *main) InvestigationSetPersonAnimation(PERSON_ANIM_WILL_POWERS, ANIM_POWERS_NORMAL_IDLE_CROPPED, ANIM_POWERS_NORMAL_IDLE_CROPPED); PlayBGM(BGM000_DETENTION_CENTER); } - LOADEXAMDATA(gUnknown_08016D44); + LOADEXAMDATA(gExaminationData_2_4_01); break; } case 7: { @@ -1040,7 +1040,7 @@ void InvestigationRoomSetup_2_4(struct Main *main) InvestigationSetPersonAnimation(PERSON_ANIM_WENDY_OLDBAG, ANIM_OLDBAG_NORMAL_IDLE, ANIM_OLDBAG_NORMAL_IDLE); PlayBGM(BGM025_INVESTIGATION_OPENING); } - LOADEXAMDATA(gUnknown_08016D6C); + LOADEXAMDATA(gExaminationData_2_4_02); break; } case 8: { @@ -1063,7 +1063,7 @@ void InvestigationRoomSetup_2_4(struct Main *main) } PlayBGM(BGM001_GUMSHOES_THEME); } - LOADEXAMDATA(gUnknown_08016DD0); + LOADEXAMDATA(gExaminationData_2_4_03); break; } case 9: { @@ -1071,7 +1071,7 @@ void InvestigationRoomSetup_2_4(struct Main *main) if(!GetFlag(0, 0xF1)) { InvestigationSetScriptSectionAndFlag(0xDF, 0xF1); } - LOADEXAMDATA(gUnknown_08016E98); + LOADEXAMDATA(gExaminationData_2_4_04); } else if(GetFlag(0, 0xE9)) { if(!GetFlag(0, 0xEA)) { @@ -1081,13 +1081,13 @@ void InvestigationRoomSetup_2_4(struct Main *main) InvestigationSetPersonAnimation(PERSON_ANIM_PENNY_NICHOLS, ANIM_NICHOLS_NORMAL_IDLE, ANIM_NICHOLS_NORMAL_IDLE); PlayBGM(BGM025_INVESTIGATION_OPENING); } - LOADEXAMDATA(gUnknown_08016F24); + LOADEXAMDATA(gExaminationData_2_4_05); } else { if(!GetFlag(0, 0xE5)) { InvestigationSetScriptSectionAndFlag(0xC7, 0xE5); } - LOADEXAMDATA(gUnknown_08016E98); + LOADEXAMDATA(gExaminationData_2_4_04); } break; } @@ -1098,7 +1098,7 @@ void InvestigationRoomSetup_2_4(struct Main *main) else { PlayBGM(BGM031_AMBIENT_BIRD_CHIRPS); } - LOADEXAMDATA(gUnknown_08016FB0); + LOADEXAMDATA(gExaminationData_2_4_06); break; } case 12: { @@ -1111,7 +1111,7 @@ void InvestigationRoomSetup_2_4(struct Main *main) } PlayBGM(BGM031_AMBIENT_BIRD_CHIRPS); } - LOADEXAMDATA(gUnknown_08017028); + LOADEXAMDATA(gExaminationData_2_4_07); break; } case 13: { @@ -1124,9 +1124,9 @@ void InvestigationRoomSetup_2_4(struct Main *main) #ifndef NONMATCHING // !! This DmaCopy uses the wrong sizeof from the previous DmaCopy // !! due to a copy paste error over on capcom's side, // !! we have to explicitly write the macro by hand - DmaCopy16(3, (gUnknown_080170DC), gExaminationData, sizeof(gUnknown_08017028)); + DmaCopy16(3, (gExaminationData_2_4_08), gExaminationData, sizeof(gExaminationData_2_4_07)); #else - LOADEXAMDATA(gUnknown_080170DC); + LOADEXAMDATA(gExaminationData_2_4_08); #endif break; } diff --git a/src/investigation_segment_3_0.c b/src/investigation_segment_3_0.c index ca6b60e..6709a38 100644 --- a/src/investigation_segment_3_0.c +++ b/src/investigation_segment_3_0.c @@ -725,7 +725,7 @@ const u8 gRoomData_3_0[21][8] = { }; // exam data -const struct ExaminationData gUnknown_08017638[5] = { +const struct ExaminationData gExaminationData_3_0_00[5] = { { .examinationSection = 0x82, .type = 0x0, @@ -783,7 +783,7 @@ const struct ExaminationData gUnknown_08017638[5] = { }, }; -const struct ExaminationData gUnknown_0801769C[2] = { +const struct ExaminationData gExaminationData_3_0_01[2] = { { .examinationSection = 0x92, .type = 0x0, @@ -808,7 +808,7 @@ const struct ExaminationData gUnknown_0801769C[2] = { }, }; -const struct ExaminationData gUnknown_080176C4[4] = { +const struct ExaminationData gExaminationData_3_0_02[4] = { { .examinationSection = 0xF6, .type = 0x0, @@ -855,7 +855,7 @@ const struct ExaminationData gUnknown_080176C4[4] = { }, }; -const struct ExaminationData gUnknown_08017714[7] = { +const struct ExaminationData gExaminationData_3_0_03[7] = { { .examinationSection = 0xF8, .type = 0x0, @@ -935,7 +935,7 @@ const struct ExaminationData gUnknown_08017714[7] = { }, }; -const struct ExaminationData gUnknown_080177A0[6] = { +const struct ExaminationData gExaminationData_3_0_04[6] = { { .examinationSection = 0xFC, .type = 0x0, @@ -1004,7 +1004,7 @@ const struct ExaminationData gUnknown_080177A0[6] = { }, }; -const struct ExaminationData gUnknown_08017818[7] = { +const struct ExaminationData gExaminationData_3_0_05[7] = { { .examinationSection = 0xC5, .type = 0x0, @@ -1084,7 +1084,7 @@ const struct ExaminationData gUnknown_08017818[7] = { }, }; -const struct ExaminationData gUnknown_080178A4[3] = { +const struct ExaminationData gExaminationData_3_0_06[3] = { { .examinationSection = 0x105, .type = 0x0, @@ -1120,7 +1120,7 @@ const struct ExaminationData gUnknown_080178A4[3] = { }, }; -const struct ExaminationData gUnknown_080178E0[6] = { +const struct ExaminationData gExaminationData_3_0_07[6] = { { .examinationSection = 0x108, .type = 0x0, @@ -1189,7 +1189,7 @@ const struct ExaminationData gUnknown_080178E0[6] = { }, }; -const struct ExaminationData gUnknown_08017958[5] = { +const struct ExaminationData gExaminationData_3_0_08[5] = { { .examinationSection = 0xE8, .type = 0x0, @@ -1272,7 +1272,7 @@ void InvestigationRoomSetup_3_0(struct Main *main) InvestigationSetPersonAnimation(PERSON_ANIM_MAYA, ANIM_MAYA_NORMAL_IDLE, ANIM_MAYA_NORMAL_IDLE); PlayBGM(BGM006_MAYAS_THEME); } - LOADEXAMDATA(gUnknown_08017638); + LOADEXAMDATA(gExaminationData_3_0_00); break; } case 2: { @@ -1296,7 +1296,7 @@ void InvestigationRoomSetup_3_0(struct Main *main) } PlayBGM(BGM000_DETENTION_CENTER); } - LOADEXAMDATA(gUnknown_0801769C); + LOADEXAMDATA(gExaminationData_3_0_01); break; } case 16: { @@ -1313,7 +1313,7 @@ void InvestigationRoomSetup_3_0(struct Main *main) else { PlayBGM(BGM031_AMBIENT_BIRD_CHIRPS); } - LOADEXAMDATA(gUnknown_080176C4); + LOADEXAMDATA(gExaminationData_3_0_02); break; } case 17: { @@ -1325,7 +1325,7 @@ void InvestigationRoomSetup_3_0(struct Main *main) InvestigationSetPersonAnimation(PERSON_ANIM_LARRY_BUTZ, ANIM_COSTUME_BUTZ_HAPPY_IDLE, ANIM_COSTUME_BUTZ_HAPPY_IDLE); PlayBGM(BGM022_HAPPY_PEOPLE); } - LOADEXAMDATA(gUnknown_080177A0); + LOADEXAMDATA(gExaminationData_3_0_04); } else { if(!GetFlag(0, 0x99)) { @@ -1337,7 +1337,7 @@ void InvestigationRoomSetup_3_0(struct Main *main) if(!GetFlag(0, 0xA0)) { PlayAnimation(ANIM_PARTY_POPPERS); } - LOADEXAMDATA(gUnknown_08017714); + LOADEXAMDATA(gExaminationData_3_0_03); } break; } @@ -1365,7 +1365,7 @@ void InvestigationRoomSetup_3_0(struct Main *main) else { PlayBGM(BGM031_AMBIENT_BIRD_CHIRPS); } - LOADEXAMDATA(gUnknown_08017818); + LOADEXAMDATA(gExaminationData_3_0_05); break; } case 19: { @@ -1375,7 +1375,7 @@ void InvestigationRoomSetup_3_0(struct Main *main) else { PlayBGM(BGM031_AMBIENT_BIRD_CHIRPS); } - LOADEXAMDATA(gUnknown_080178A4); + LOADEXAMDATA(gExaminationData_3_0_06); break; } case 14: { @@ -1411,7 +1411,7 @@ void InvestigationRoomSetup_3_0(struct Main *main) else { PlayBGM(BGM001_GUMSHOES_THEME); } - LOADEXAMDATA(gUnknown_080178E0); + LOADEXAMDATA(gExaminationData_3_0_07); break; } case 3: { @@ -1427,7 +1427,7 @@ void InvestigationRoomSetup_3_0(struct Main *main) else if(!GetFlag(0, 0xAC)) { InvestigationSetScriptSectionAndFlag(0xE5, 0xAC); } - LOADEXAMDATA(gUnknown_08017958); + LOADEXAMDATA(gExaminationData_3_0_08); break; } } diff --git a/src/investigation_segment_3_2.c b/src/investigation_segment_3_2.c index 7a39119..bb5eddb 100644 --- a/src/investigation_segment_3_2.c +++ b/src/investigation_segment_3_2.c @@ -564,7 +564,7 @@ const u8 gRoomData_3_2[21][8] = { }; // exam data -const struct ExaminationData gUnknown_08017D34[5] = { +const struct ExaminationData gExaminationData_3_2_00[5] = { { .examinationSection = 0x81, .type = 0x0, @@ -622,7 +622,7 @@ const struct ExaminationData gUnknown_08017D34[5] = { }, }; -const struct ExaminationData gUnknown_08017D98[2] = { +const struct ExaminationData gExaminationData_3_2_01[2] = { { .examinationSection = 0x8B, .type = 0x0, @@ -647,7 +647,7 @@ const struct ExaminationData gUnknown_08017D98[2] = { }, }; -const struct ExaminationData gUnknown_08017DC0[4] = { +const struct ExaminationData gExaminationData_3_2_02[4] = { { .examinationSection = 0x10E, .type = 0x0, @@ -694,7 +694,7 @@ const struct ExaminationData gUnknown_08017DC0[4] = { }, }; -const struct ExaminationData gUnknown_08017E10[6] = { +const struct ExaminationData gExaminationData_3_2_03[6] = { { .examinationSection = 0x110, .type = 0x0, @@ -763,7 +763,7 @@ const struct ExaminationData gUnknown_08017E10[6] = { }, }; -const struct ExaminationData gUnknown_08017E88[11] = { +const struct ExaminationData gExaminationData_3_2_04[11] = { { .examinationSection = 0x115, .type = 0x0, @@ -887,7 +887,7 @@ const struct ExaminationData gUnknown_08017E88[11] = { }, }; -const struct ExaminationData gUnknown_08017F64[7] = { +const struct ExaminationData gExaminationData_3_2_05[7] = { { .examinationSection = 0x11B, .type = 0x0, @@ -967,7 +967,7 @@ const struct ExaminationData gUnknown_08017F64[7] = { }, }; -const struct ExaminationData gUnknown_08017FF0[3] = { +const struct ExaminationData gExaminationData_3_2_06[3] = { { .examinationSection = 0x123, .type = 0x0, @@ -1003,7 +1003,7 @@ const struct ExaminationData gUnknown_08017FF0[3] = { }, }; -const struct ExaminationData gUnknown_0801802C[7] = { +const struct ExaminationData gExaminationData_3_2_07[7] = { { .examinationSection = 0xF7, .type = 0x0, @@ -1083,7 +1083,7 @@ const struct ExaminationData gUnknown_0801802C[7] = { }, }; -const struct ExaminationData gUnknown_080180B8[6] = { +const struct ExaminationData gExaminationData_3_2_08[6] = { { .examinationSection = 0x12C, .type = 0x0, @@ -1152,7 +1152,7 @@ const struct ExaminationData gUnknown_080180B8[6] = { }, }; -const struct ExaminationData gUnknown_08018130[4] = { +const struct ExaminationData gExaminationData_3_2_09[4] = { { .examinationSection = 0x136, .type = 0x0, @@ -1199,7 +1199,7 @@ const struct ExaminationData gUnknown_08018130[4] = { }, }; -const struct ExaminationData gUnknown_08018180[5] = { +const struct ExaminationData gExaminationData_3_2_10[5] = { { .examinationSection = 0xF2, .type = 0x0, @@ -1281,7 +1281,7 @@ void InvestigationRoomSetup_3_2(struct Main *main) else if(!GetFlag(0, 0xC0)) { InvestigationSetScriptSectionAndFlag(0x80, 0xC0); } - LOADEXAMDATA(gUnknown_08017D34); + LOADEXAMDATA(gExaminationData_3_2_00); break; } case 2: { @@ -1300,7 +1300,7 @@ void InvestigationRoomSetup_3_2(struct Main *main) InvestigationSetPersonAnimation(PERSON_ANIM_MAYA, ANIM_MAYA_NORMAL_IDLE_CROPPED, ANIM_MAYA_NORMAL_IDLE_CROPPED); PlayBGM(BGM006_MAYAS_THEME); } - LOADEXAMDATA(gUnknown_08017D98); + LOADEXAMDATA(gExaminationData_3_2_01); break; } case 16: { @@ -1322,7 +1322,7 @@ void InvestigationRoomSetup_3_2(struct Main *main) else { PlayBGM(BGM031_AMBIENT_BIRD_CHIRPS); } - LOADEXAMDATA(gUnknown_08017DC0); + LOADEXAMDATA(gExaminationData_3_2_02); break; } case 17: { @@ -1339,7 +1339,7 @@ void InvestigationRoomSetup_3_2(struct Main *main) } PlayBGM(BGM021_STEEL_SAMURAI_THEME); } - LOADEXAMDATA(gUnknown_08017E88); + LOADEXAMDATA(gExaminationData_3_2_04); } else { if(!GetFlag(0, 0xC9)) { @@ -1348,7 +1348,7 @@ void InvestigationRoomSetup_3_2(struct Main *main) else { PlayBGM(BGM031_AMBIENT_BIRD_CHIRPS); } - LOADEXAMDATA(gUnknown_08017E10); + LOADEXAMDATA(gExaminationData_3_2_03); } break; } @@ -1378,7 +1378,7 @@ void InvestigationRoomSetup_3_2(struct Main *main) else { PlayBGM(BGM031_AMBIENT_BIRD_CHIRPS); } - LOADEXAMDATA(gUnknown_08017F64); + LOADEXAMDATA(gExaminationData_3_2_05); break; } case 19: { @@ -1415,7 +1415,7 @@ void InvestigationRoomSetup_3_2(struct Main *main) else { PlayBGM(BGM031_AMBIENT_BIRD_CHIRPS); } - LOADEXAMDATA(gUnknown_08017FF0); + LOADEXAMDATA(gExaminationData_3_2_06); break; } case 20: { @@ -1431,7 +1431,7 @@ void InvestigationRoomSetup_3_2(struct Main *main) } PlayBGM(BGM026_GROSSBERGS_THEME); } - LOADEXAMDATA(gUnknown_0801802C); + LOADEXAMDATA(gExaminationData_3_2_07); break; } case 14: { @@ -1467,7 +1467,7 @@ void InvestigationRoomSetup_3_2(struct Main *main) else if(!GetFlag(0, 0xDE)) { InvestigationSetScriptSectionAndFlag(0xDC, 0xDE); } - LOADEXAMDATA(gUnknown_080180B8); + LOADEXAMDATA(gExaminationData_3_2_08); break; } case 15: { @@ -1478,14 +1478,14 @@ void InvestigationRoomSetup_3_2(struct Main *main) InvestigationSetPersonAnimation(PERSON_ANIM_MAYA, ANIM_MAYA_NORMAL_IDLE, ANIM_MAYA_NORMAL_IDLE); PlayBGM(BGM012_INVESTIGATION_CORE); } - LOADEXAMDATA(gUnknown_08018130); + LOADEXAMDATA(gExaminationData_3_2_09); break; } case 3: { if(!GetFlag(0, 0xE5)) { InvestigationSetScriptSectionAndFlag(0xEF, 0xE5); } - LOADEXAMDATA(gUnknown_08018180); + LOADEXAMDATA(gExaminationData_3_2_10); break; } } diff --git a/src/investigation_segment_3_4.c b/src/investigation_segment_3_4.c index e24cb05..e4cfe7a 100644 --- a/src/investigation_segment_3_4.c +++ b/src/investigation_segment_3_4.c @@ -255,7 +255,7 @@ const u8 gRoomData_3_4[21][8] = { }; // exam data -const struct ExaminationData gUnknown_080183E4[5] = { +const struct ExaminationData gExaminationData_3_4_00[5] = { { .examinationSection = 0x82, .type = 0x0, @@ -313,7 +313,7 @@ const struct ExaminationData gUnknown_080183E4[5] = { }, }; -const struct ExaminationData gUnknown_08018448[2] = { +const struct ExaminationData gExaminationData_3_4_01[2] = { { .examinationSection = 0x91, .type = 0x0, @@ -338,7 +338,7 @@ const struct ExaminationData gUnknown_08018448[2] = { }, }; -const struct ExaminationData gUnknown_08018470[4] = { +const struct ExaminationData gExaminationData_3_4_02[4] = { { .examinationSection = 0xC5, .type = 0x0, @@ -385,7 +385,7 @@ const struct ExaminationData gUnknown_08018470[4] = { }, }; -const struct ExaminationData gUnknown_080184C0[6] = { +const struct ExaminationData gExaminationData_3_4_03[6] = { { .examinationSection = 0xC7, .type = 0x0, @@ -454,7 +454,7 @@ const struct ExaminationData gUnknown_080184C0[6] = { }, }; -const struct ExaminationData gUnknown_08018538[3] = { +const struct ExaminationData gExaminationData_3_4_04[3] = { { .examinationSection = 0xCC, .type = 0x0, @@ -490,7 +490,7 @@ const struct ExaminationData gUnknown_08018538[3] = { }, }; -const struct ExaminationData gUnknown_08018574[7] = { +const struct ExaminationData gExaminationData_3_4_05[7] = { { .examinationSection = 0xBB, .type = 0x0, @@ -570,7 +570,7 @@ const struct ExaminationData gUnknown_08018574[7] = { }, }; -const struct ExaminationData gUnknown_08018600[6] = { +const struct ExaminationData gExaminationData_3_4_06[6] = { { .examinationSection = 0xD4, .type = 0x0, @@ -639,7 +639,7 @@ const struct ExaminationData gUnknown_08018600[6] = { }, }; -const struct ExaminationData gUnknown_08018678[5] = { +const struct ExaminationData gExaminationData_3_4_07[5] = { { .examinationSection = 0xDC, .type = 0x0, @@ -697,7 +697,7 @@ const struct ExaminationData gUnknown_08018678[5] = { }, }; -const struct ExaminationData gUnknown_080186DC[5] = { +const struct ExaminationData gExaminationData_3_4_08[5] = { { .examinationSection = 0xA6, .type = 0x0, @@ -783,7 +783,7 @@ void InvestigationRoomSetup_3_4(struct Main *main) InvestigationSetPersonAnimation(PERSON_ANIM_LARRY_BUTZ, ANIM_BUTZ_NORMAL_IDLE, ANIM_BUTZ_NORMAL_IDLE); PlayBGM(BGM022_HAPPY_PEOPLE); } - LOADEXAMDATA(gUnknown_080183E4); + LOADEXAMDATA(gExaminationData_3_4_00); break; } case 2: { @@ -799,7 +799,7 @@ void InvestigationRoomSetup_3_4(struct Main *main) else if(!GetFlag(0, 0x94)) { InvestigationSetScriptSectionAndFlag(0x90, 0x94); } - LOADEXAMDATA(gUnknown_08018448); + LOADEXAMDATA(gExaminationData_3_4_01); break; } case 16: { @@ -809,7 +809,7 @@ void InvestigationRoomSetup_3_4(struct Main *main) else { PlayBGM(BGM031_AMBIENT_BIRD_CHIRPS); } - LOADEXAMDATA(gUnknown_08018470); + LOADEXAMDATA(gExaminationData_3_4_02); break; } case 17: { @@ -819,7 +819,7 @@ void InvestigationRoomSetup_3_4(struct Main *main) else { PlayBGM(BGM031_AMBIENT_BIRD_CHIRPS); } - LOADEXAMDATA(gUnknown_080184C0); + LOADEXAMDATA(gExaminationData_3_4_03); break; } case 19: { @@ -829,7 +829,7 @@ void InvestigationRoomSetup_3_4(struct Main *main) else { PlayBGM(BGM031_AMBIENT_BIRD_CHIRPS); } - LOADEXAMDATA(gUnknown_08018538); + LOADEXAMDATA(gExaminationData_3_4_04); break; } case 20: { @@ -839,7 +839,7 @@ void InvestigationRoomSetup_3_4(struct Main *main) else { PlayBGM(BGM012_INVESTIGATION_CORE); } - LOADEXAMDATA(gUnknown_08018574); + LOADEXAMDATA(gExaminationData_3_4_05); break; } case 14: { @@ -859,7 +859,7 @@ void InvestigationRoomSetup_3_4(struct Main *main) PlayBGM(BGM001_GUMSHOES_THEME); } } - LOADEXAMDATA(gUnknown_08018600); + LOADEXAMDATA(gExaminationData_3_4_06); break; } case 15: { @@ -873,7 +873,7 @@ void InvestigationRoomSetup_3_4(struct Main *main) PlayBGM(BGM012_INVESTIGATION_CORE); } PlayAnimation(ANIM_RECORDS_ROOM_DRAWER); - LOADEXAMDATA(gUnknown_08018678); + LOADEXAMDATA(gExaminationData_3_4_07); break; } case 3: { @@ -889,7 +889,7 @@ void InvestigationRoomSetup_3_4(struct Main *main) else if(!GetFlag(0, 0x9D)) { InvestigationSetScriptSectionAndFlag(0xA3, 0x9D); } - LOADEXAMDATA(gUnknown_080186DC); + LOADEXAMDATA(gExaminationData_3_4_08); break; } } From 39d5641a75b6a6d33a2193efdc1af418b1fa482f Mon Sep 17 00:00:00 2001 From: Missingmew Date: Mon, 4 Sep 2023 00:14:53 +0200 Subject: [PATCH 11/17] no unknown struct members of interest left --- include/animation.h | 4 +-- include/background.h | 1 - include/court.h | 2 +- include/court_record.h | 2 +- include/investigation.h | 2 +- include/main.h | 8 ++--- include/script.h | 10 +++--- src/animation.c | 54 ++++++++++++++++----------------- src/bg.c | 8 ++--- src/court.c | 4 +-- src/court_record.c | 2 +- src/investigation_segment_1_0.c | 28 ++++++++--------- src/investigation_segment_1_2.c | 26 ++++++++-------- src/investigation_segment_2_0.c | 34 ++++++++++----------- src/investigation_segment_2_2.c | 36 +++++++++++----------- src/investigation_segment_2_4.c | 26 ++++++++-------- src/investigation_segment_3_0.c | 48 ++++++++++++++--------------- src/investigation_segment_3_2.c | 36 +++++++++++----------- src/investigation_segment_3_4.c | 24 +++++++-------- src/save_processes.c | 2 +- src/script_commands2.c | 16 +++++----- src/script_main.c | 2 +- src/title_processes.c | 2 +- 23 files changed, 187 insertions(+), 190 deletions(-) diff --git a/include/animation.h b/include/animation.h index 3be2ae0..8d5203c 100644 --- a/include/animation.h +++ b/include/animation.h @@ -32,7 +32,6 @@ struct AnimationInfo { /* +0x00 */ u16 animId; /* +0x02 */ u8 personId; - /* +0x03 */ u8 unk3; // padding? /* +0x04 */ s16 xOrigin; /* +0x06 */ s16 yOrigin; /* +0x08 */ u8 *volatile animFrameDataStartPtr; // !! THESE 4 POINTERS ARE VOLATILE TO MATCH MoveAnimationTilesToRam AND THAT COULD BE INCORRECT @@ -76,7 +75,6 @@ struct AnimationBackupStruct { /* +0x00 */ u16 animId; /* +0x02 */ u8 personId; - /* +0x03 */ u8 unk3; // padding? /* +0x04 */ s16 xOrigin; /* +0x06 */ s16 yOrigin; /* +0x08 */ u8 * animFrameDataStartPtr; @@ -95,7 +93,7 @@ struct PersonAnimationData /* +0x00 */ u8* gfxData; /* +0x04 */ u8* frameData; /* +0x08 */ u16 spriteCount; - /* +0x0A */ u16 unkA; // padding? + /* +0x0A */ u16 unusedA; // padding? }; struct AnimationData diff --git a/include/background.h b/include/background.h index 6daac87..0423d67 100644 --- a/include/background.h +++ b/include/background.h @@ -49,7 +49,6 @@ struct CourtScroll /* +0x00 */ u8 * frameDataPtr; /* +0x04 */ u16 state; /* +0x06 */ u8 scrollMode; - /* +0x07 */ u8 unk7; // padding /* +0x08 */ u16 scrollingPersonAnimId; /* +0x0A */ u16 animOffset; /* +0x0C */ s16 frameCounter; diff --git a/include/court.h b/include/court.h index 301823b..58d9b84 100644 --- a/include/court.h +++ b/include/court.h @@ -9,7 +9,7 @@ struct TestimonyStruct /* +0x03 */ u8 presentPromptY; // unity AA4: pos_y_tukitukeru /* +0x04 */ u16 healthPointX; // unity AA4: pos_x_rest /* +0x06 */ u8 testimonyAnimMoveAmount; // unity AA4: add - /* +0x07 */ u8 unk7; // unity AA4: dm00 filler dummy + /* +0x07 */ u8 unused7; // unity AA4: dm00 filler dummy }; extern struct TestimonyStruct gTestimony; diff --git a/include/court_record.h b/include/court_record.h index adf62bf..6af413f 100644 --- a/include/court_record.h +++ b/include/court_record.h @@ -14,7 +14,7 @@ struct CourtRecord /* +0x08 */ u8 recordArrowFrame; // unity AA4: arrow_type /* +0x09 */ u8 recordArrowCounter; // unity AA4: arrow_timer /* +0x0A */ bool8 windowIsSaveScreen; // unity AA4: win_flag - /* +0x0B */ u8 unkB; // unity AA4: win_type // unused + /* +0x0B */ u8 unusedB; // unity AA4: win_type // unused /* +0x0C */ u8 flags; // unity AA4: page_status /* +0x0D */ u8 selectedItem; // unity AA4: page_now /* +0x0E */ u8 displayItemCount; // unity AA4: page_now_max diff --git a/include/investigation.h b/include/investigation.h index 158fde5..e8892f9 100644 --- a/include/investigation.h +++ b/include/investigation.h @@ -8,7 +8,7 @@ struct TalkData { /* +0x00 */ u8 roomId; /* +0x01 */ u8 personId; - /* +0x02 */ u8 unk2; // called dm in unity? probably means dummy, unused + /* +0x02 */ u8 unused2; // called dm in unity? probably means dummy, unused /* +0x03 */ u8 enableFlag; // en- or disables this specific set of talk data, allows for multiple sets for one character in one room /* +0x04 */ u8 iconId[0x4]; /* +0x08 */ u8 talkFlagId[0x4]; diff --git a/include/main.h b/include/main.h index 320d9b9..eb2290c 100644 --- a/include/main.h +++ b/include/main.h @@ -47,14 +47,14 @@ struct Main /* +0x028 */ u16 currentBG; // BG related code not in GlobalWork struct, this might be another struct on its own but i'm not sure /* +0x02A */ s16 previousBG; // probably wrong /* +0x02C */ s8 currentBgStripe; // maybe Bg256_rno_0? - /* +0x02D */ u8 unk2D; // unused field maybe Bg256_SP_Flag? + /* +0x02D */ u8 unused2D; // unused field maybe Bg256_SP_Flag? /* +0x02E */ bool8 isBGScrolling; // unity AA4: Bg256_scroll_flag /* +0x02F */ u8 Bg256_stop_line; // unity AA4: Bg256_stop_line /* +0x030 */ s16 Bg256_scroll_x; // unity AA4: Bg256_scroll_x /* +0x032 */ s16 Bg256_scroll_y; // unity AA4: Bg256_scroll_y /* +0x034 */ s16 Bg256_pos_x; // unity AA4: Bg256_pos_x /* +0x036 */ s16 Bg256_pos_y; // unity AA4: Bg256_pos_y - /* +0x038 */ u16 unk38; // unity AA4: Bg256_add? unused but is background related 100% + /* +0x038 */ u16 unused38; // unity AA4: Bg256_add? unused but is background related 100% /* +0x03A */ s16 Bg256_dir; // unity AA4: Bg256_dir /* +0x03C */ s8 horizontolBGScrollSpeed; // unity AA4: Bg256_scroll_speed_x /* +0x03D */ s8 verticalBGScrollSpeed; // unity AA4: Bg256_scroll_speed_y @@ -80,7 +80,7 @@ struct Main /* +0x088 */ u8 damageFrame; // unity: Rest_type /* +0x089 */ u8 damageFrameTimer; // unity: Rest_timer /* +0x08A */ u8 previousHealth; // unity: rest_old - /* +0x08B */ u8 unk8B; // unused + /* +0x08B */ u8 unused8B; // unused /* +0x08C */ u8 currentRoomId; // unity: Room? uint in unity /* +0x08D */ u8 scenarioIdx; // unity: scenario, actually the script you're running /* +0x08E */ u8 caseEnabledFlags; // unity: Scenario_enable, whetever a case is enabled or not, unity names suck @@ -92,7 +92,7 @@ struct Main /* +0x0B8 */ u32 talkEndFlags[8]; // unity: talk_end_flag /* +0x0D8 */ u8 roomData[24][8]; // unity: Map_data //TODO: first size might be wrong /* +0x198 */ u32 soundFlags; - /* +0x19C */ u32 unk19C; // bit 2 is set, never used + /* +0x19C */ u32 unused19C; // bit 2 is set, never used }; struct IORegisters diff --git a/include/script.h b/include/script.h index c0832aa..d58b06d 100644 --- a/include/script.h +++ b/include/script.h @@ -22,7 +22,7 @@ struct ScriptContext /* +0x12 */ u8 fullscreenTextX; /* +0x13 */ u8 textSkip; /* +0x14 */ u8 paragraphSkipDelayCounter; // unity AA4: speed_timer? - /* +0x15 */ u8 unk15; // unity AA4: speed_time? // set once never used + /* +0x15 */ u8 unused15; // unity AA4: speed_time? // set once never used /* +0x16 */ u8 soundCueSkip; // unity AA4: moji_cnt /* +0x17 */ u8 currentSoundCue; // unity AA4: moji_se /* +0x18 */ s16 textXOffset; // unity AA4: plate_pos_x @@ -39,9 +39,9 @@ struct ScriptContext /* +0x2A */ u16 fullscreenTextYOffset; // unity: AA4: sel_pos_y /* +0x2C */ u16 holdItSection; // unity AA4: tukkomi_no /* +0x2E */ u8 holdItFlag; // unity AA4: tukkomi_flag - /* +0x2F */ u8 unk2F; // unity AA4: moji? // unused - /* +0x30 */ u8 unk30; // unity AA4: houtei_page? // unused - /* +0x31 */ u8 unk31; // unity AA4: plate_set_flag? // unused + /* +0x2F */ u8 unused2F; // unity AA4: moji? // unused + /* +0x30 */ u8 unused30; // unity AA4: houtei_page? // unused + /* +0x31 */ u8 unused31; // unity AA4: plate_set_flag? // unused /* +0x32 */ u8 personAnimPauseCounter; // unity: rt_wait_timer /* +0x33 */ bool8 slamDesk; // unity: desk_attack /* +0x34 */ u8 textboxNameId; // unity: speaker_id @@ -50,7 +50,7 @@ struct ScriptContext /* +0x37 */ u8 textboxDownArrowDelayCounter; // unity AA4: enter_type_timer /* +0x38 */ u8 textboxState; // unity: mess_win_rno /* +0x39 */ u8 fullscreenCursorPos; // unity AA4: cursol - /* +0x3A */ u8 unk3A; // unity AA4: add_y, used but does nothing + /* +0x3A */ u8 unused3A; // unity AA4: add_y, used but does nothing /* +0x3B */ u8 textboxYPos; // unity AA4: frame_y /* +0x3C */ u8 * mapMarkerVramPtr; // unity AA4: Expl_now_vram_addr? }; diff --git a/src/animation.c b/src/animation.c index 56845a0..a0a7c8f 100644 --- a/src/animation.c +++ b/src/animation.c @@ -11,7 +11,7 @@ #include "constants/process.h" #include "constants/animation_offsets.h" -#define DUMMYPERSON { .gfxData = 0, .frameData = 0, .spriteCount = 0, .unkA = 0 } +#define DUMMYPERSON { .gfxData = 0, .frameData = 0, .spriteCount = 0, .unusedA = 0 } #define DUMMYANIMATION { .gfxData = 0, .vramPtr = 0, .frameData = 0, .xOrigin = 0, .yOrigin = 0, .paletteSlot = 0, .spriteCount = 0, .priority = 0, .flags = 0x0, } const struct PersonAnimationData gPersonAnimData[] = { @@ -21,52 +21,52 @@ const struct PersonAnimationData gPersonAnimData[] = { .gfxData = gGfxPixAnimationChar01, .frameData = gGfxSeqAnimationChar01, .spriteCount = 37, - .unkA = 0x0, + .unusedA = 0x0, }, [PERSON_ANIM_DUMMY03] = DUMMYPERSON, [PERSON_ANIM_MAYA] = { .gfxData = gGfxPixAnimationChar02, .frameData = gGfxSeqAnimationChar02, .spriteCount = 28, - .unkA = 0x0, + .unusedA = 0x0, }, [PERSON_ANIM_SUMMONED_MIA] = { .gfxData = gGfxPixAnimationChar03, .frameData = gGfxSeqAnimationChar03, .spriteCount = 28, - .unkA = 0x0, + .unusedA = 0x0, }, [PERSON_ANIM_DUMMY06] = DUMMYPERSON, [PERSON_ANIM_MIA] = { .gfxData = gGfxPixAnimationChar04, .frameData = gGfxSeqAnimationChar04, .spriteCount = 28, - .unkA = 0x0, + .unusedA = 0x0, }, [PERSON_ANIM_JUDGE] = { .gfxData = gGfxPixAnimationChar05, .frameData = gGfxSeqAnimationChar05, .spriteCount = 19, - .unkA = 0x0, + .unusedA = 0x0, }, [PERSON_ANIM_EDGEWORTH] = { .gfxData = gGfxPixAnimationChar06, .frameData = gGfxSeqAnimationChar06, .spriteCount = 38, - .unkA = 0x0, + .unusedA = 0x0, }, [PERSON_ANIM_WINSTON_PAYNE] = { .gfxData = gGfxPixAnimationChar10, .frameData = gGfxSeqAnimationChar10, .spriteCount = 23, - .unkA = 0x0, + .unusedA = 0x0, }, [PERSON_ANIM_DUMMY11] = DUMMYPERSON, [PERSON_ANIM_MARVIN_GROSSBERG] = { .gfxData = gGfxPixAnimationChar14, .frameData = gGfxSeqAnimationChar14, .spriteCount = 33, - .unkA = 0x0, + .unusedA = 0x0, }, [PERSON_ANIM_DUMMY13] = DUMMYPERSON, [PERSON_ANIM_DUMMY14] = DUMMYPERSON, @@ -75,110 +75,110 @@ const struct PersonAnimationData gPersonAnimData[] = { .gfxData = gGfxPixAnimationChar16, .frameData = gGfxSeqAnimationChar16, .spriteCount = 14, - .unkA = 0x0, + .unusedA = 0x0, }, [PERSON_ANIM_WENDY_OLDBAG] = { .gfxData = gGfxPixAnimationChar15, .frameData = gGfxSeqAnimationChar15, .spriteCount = 29, - .unkA = 0x0, + .unusedA = 0x0, }, [PERSON_ANIM_SAL_MANELLA] = { .gfxData = gGfxPixAnimationChar18, .frameData = gGfxSeqAnimationChar18, .spriteCount = 39, - .unkA = 0x0, + .unusedA = 0x0, }, [PERSON_ANIM_DUMMY19] = DUMMYPERSON, [PERSON_ANIM_GUMSHOE] = { .gfxData = gGfxPixAnimationChar07, .frameData = gGfxSeqAnimationChar07, .spriteCount = 39, - .unkA = 0x0, + .unusedA = 0x0, }, [PERSON_ANIM_REDD_WHITE] = { .gfxData = gGfxPixAnimationChar08, .frameData = gGfxSeqAnimationChar08, .spriteCount = 36, - .unkA = 0x0, + .unusedA = 0x0, }, [PERSON_ANIM_APRIL_MAY] = { .gfxData = gGfxPixAnimationChar09, .frameData = gGfxSeqAnimationChar09, .spriteCount = 30, - .unkA = 0x0, + .unusedA = 0x0, }, [PERSON_ANIM_BELLBOY] = { .gfxData = gGfxPixAnimationChar11, .frameData = gGfxSeqAnimationChar11, .spriteCount = 35, - .unkA = 0x0, + .unusedA = 0x0, }, [PERSON_ANIM_DEE_VASQUEZ] = { .gfxData = gGfxPixAnimationChar19, .frameData = gGfxSeqAnimationChar19, .spriteCount = 29, - .unkA = 0x0, + .unusedA = 0x0, }, [PERSON_ANIM_LARRY_BUTZ] = { .gfxData = gGfxPixAnimationChar12, .frameData = gGfxSeqAnimationChar12, .spriteCount = 39, - .unkA = 0x0, + .unusedA = 0x0, }, [PERSON_ANIM_FRANK_SAWHIT] = { .gfxData = gGfxPixAnimationChar13, .frameData = gGfxSeqAnimationChar13, .spriteCount = 38, - .unkA = 0x0, + .unusedA = 0x0, }, [PERSON_ANIM_WILL_POWERS] = { .gfxData = gGfxPixAnimationChar17, .frameData = gGfxSeqAnimationChar17, .spriteCount = 39, - .unkA = 0x0, + .unusedA = 0x0, }, [PERSON_ANIM_CODY_HACKINS] = { .gfxData = gGfxPixAnimationChar20, .frameData = gGfxSeqAnimationChar20, .spriteCount = 18, - .unkA = 0x0, + .unusedA = 0x0, }, [PERSON_ANIM_BUSTUP_PHOENIX] = { .gfxData = gGfxPixAnimationChar21, .frameData = gGfxSeqAnimationChar21, .spriteCount = 7, - .unkA = 0x0, + .unusedA = 0x0, }, [PERSON_ANIM_BUSTUP_EDGEWORTH] = { .gfxData = gGfxPixAnimationChar22, .frameData = gGfxSeqAnimationChar22, .spriteCount = 10, - .unkA = 0x0, + .unusedA = 0x0, }, [PERSON_ANIM_LOTTA_HART] = { .gfxData = gGfxPixAnimationChar23, .frameData = gGfxSeqAnimationChar23, .spriteCount = 24, - .unkA = 0x0, + .unusedA = 0x0, }, [PERSON_ANIM_YANNI_YOGI] = { .gfxData = gGfxPixAnimationChar24, .frameData = gGfxSeqAnimationChar24, .spriteCount = 29, - .unkA = 0x0, + .unusedA = 0x0, }, [PERSON_ANIM_MANFRED_VONKARMA] = { .gfxData = gGfxPixAnimationChar25, .frameData = gGfxSeqAnimationChar25, .spriteCount = 36, - .unkA = 0x0, + .unusedA = 0x0, }, [PERSON_ANIM_POLLY] = { .gfxData = gGfxPixAnimationChar26, .frameData = gGfxSeqAnimationChar26, .spriteCount = 10, - .unkA = 0x0, + .unusedA = 0x0, }, }; diff --git a/src/bg.c b/src/bg.c index e477321..5305b0c 100644 --- a/src/bg.c +++ b/src/bg.c @@ -220,7 +220,7 @@ void SetTextboxSize(u32 unk0) SetTextboxNametag(scriptCtx->textboxNameId & 0x7F, (u8)(scriptCtx->textboxNameId & 0x80)); break; case 1: - scriptCtx->unk3A = 0; + scriptCtx->unused3A = 0; scriptCtx->textboxYPos = 14; scriptCtx->textboxState = 2; SetTextboxNametag(0, FALSE); @@ -259,10 +259,10 @@ void UpdateTextbox() case 1: break; case 2: - scriptCtx->unk3A += 2; - if(scriptCtx->unk3A < 2) + scriptCtx->unused3A += 2; + if(scriptCtx->unused3A < 2) break; - scriptCtx->unk3A = 0; + scriptCtx->unused3A = 0; tiley = scriptCtx->textboxYPos * 32; for(i = 0; i < 32; i++) { diff --git a/src/court.c b/src/court.c index 0ba2d14..3a6192d 100644 --- a/src/court.c +++ b/src/court.c @@ -764,11 +764,11 @@ void VerdictProcess(struct Main * main) } } -void UpdateQuestioningMenuSprites(struct Main * main, struct TestimonyStruct * testimony, u32 unk2) // questioning_menu_disp +void UpdateQuestioningMenuSprites(struct Main * main, struct TestimonyStruct * testimony, u32 clearButtonOAMs) // questioning_menu_disp { u32 i; struct OamAttrs * oam; - if(gScriptContext.holdItSection == 0 || unk2 == 0) + if(gScriptContext.holdItSection == 0 || clearButtonOAMs == 0) { oam = &gOamObjects[53]; oam->attr0 = SPRITE_ATTR0_CLEAR; diff --git a/src/court_record.c b/src/court_record.c index 28eabb6..68d7c4f 100644 --- a/src/court_record.c +++ b/src/court_record.c @@ -1187,7 +1187,7 @@ void CourtRecordDetailSubMenu(struct Main * main, struct CourtRecord * courtReco main->Bg256_scroll_y = gSaveDataBuffer.main.Bg256_scroll_y; main->Bg256_pos_x = gSaveDataBuffer.main.Bg256_pos_x; main->Bg256_pos_y = gSaveDataBuffer.main.Bg256_pos_y; - main->unk38 = gSaveDataBuffer.main.unk38; + main->unused38 = gSaveDataBuffer.main.unused38; main->Bg256_dir = gSaveDataBuffer.main.Bg256_dir; main->horizontolBGScrollSpeed = gSaveDataBuffer.main.horizontolBGScrollSpeed; main->verticalBGScrollSpeed = gSaveDataBuffer.main.verticalBGScrollSpeed; diff --git a/src/investigation_segment_1_0.c b/src/investigation_segment_1_0.c index 516cba6..ba90354 100644 --- a/src/investigation_segment_1_0.c +++ b/src/investigation_segment_1_0.c @@ -476,7 +476,7 @@ const struct TalkData gTalkData_1_0[14] = { { .roomId = 0x0, .personId = PERSON_ANIM_MAYA, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x1, 0x2, 0xFF, 0xFF }, .talkFlagId = { 0x1, 0x2, 0xFF, 0xFF }, @@ -485,7 +485,7 @@ const struct TalkData gTalkData_1_0[14] = { { .roomId = 0x0, .personId = PERSON_ANIM_MAYA, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x1, 0x2, 0x0, 0xFF }, .talkFlagId = { 0x1, 0x2, 0x0, 0xFF }, @@ -494,7 +494,7 @@ const struct TalkData gTalkData_1_0[14] = { { .roomId = 0x2, .personId = PERSON_ANIM_MAYA, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x4, 0x6, 0xFF, 0xFF }, .talkFlagId = { 0x4, 0x3, 0xFF, 0xFF }, @@ -503,7 +503,7 @@ const struct TalkData gTalkData_1_0[14] = { { .roomId = 0x2, .personId = PERSON_ANIM_MAYA, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x4, 0x6, 0x8, 0xFF }, .talkFlagId = { 0x4, 0x3, 0x5, 0xFF }, @@ -512,7 +512,7 @@ const struct TalkData gTalkData_1_0[14] = { { .roomId = 0x2, .personId = PERSON_ANIM_MAYA, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x4, 0x6, 0x7, 0xFF }, .talkFlagId = { 0x4, 0x3, 0x6, 0xFF }, @@ -521,7 +521,7 @@ const struct TalkData gTalkData_1_0[14] = { { .roomId = 0x2, .personId = PERSON_ANIM_MAYA, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x4, 0x6, 0x8, 0x7 }, .talkFlagId = { 0x4, 0x3, 0x5, 0x6 }, @@ -530,7 +530,7 @@ const struct TalkData gTalkData_1_0[14] = { { .roomId = 0x0, .personId = PERSON_ANIM_GUMSHOE, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x3, 0x4, 0xFF, 0xFF }, .talkFlagId = { 0x7, 0x8, 0xFF, 0xFF }, @@ -539,7 +539,7 @@ const struct TalkData gTalkData_1_0[14] = { { .roomId = 0x0, .personId = PERSON_ANIM_GUMSHOE, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x3, 0x4, 0x5, 0xFF }, .talkFlagId = { 0x7, 0x8, 0x9, 0xFF }, @@ -548,7 +548,7 @@ const struct TalkData gTalkData_1_0[14] = { { .roomId = 0x5, .personId = PERSON_ANIM_APRIL_MAY, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0xC, 0xD, 0xE, 0xFF }, .talkFlagId = { 0xA, 0xB, 0xC, 0xFF }, @@ -557,7 +557,7 @@ const struct TalkData gTalkData_1_0[14] = { { .roomId = 0x2, .personId = PERSON_ANIM_MAYA, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x6, 0x9, 0xFF, 0xFF }, .talkFlagId = { 0x3, 0xD, 0xFF, 0xFF }, @@ -566,7 +566,7 @@ const struct TalkData gTalkData_1_0[14] = { { .roomId = 0x2, .personId = PERSON_ANIM_MAYA, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x6, 0x9, 0xA, 0xFF }, .talkFlagId = { 0x3, 0xD, 0xE, 0xFF }, @@ -575,7 +575,7 @@ const struct TalkData gTalkData_1_0[14] = { { .roomId = 0x2, .personId = PERSON_ANIM_MAYA, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x6, 0x9, 0xA, 0xB }, .talkFlagId = { 0x3, 0xD, 0xE, 0xF }, @@ -584,7 +584,7 @@ const struct TalkData gTalkData_1_0[14] = { { .roomId = 0x3, .personId = PERSON_ANIM_MARVIN_GROSSBERG, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0xF, 0x3, 0x10, 0xFF }, .talkFlagId = { 0x10, 0x11, 0x12, 0xFF }, @@ -593,7 +593,7 @@ const struct TalkData gTalkData_1_0[14] = { { .roomId = 0xFF, .personId = 0xFF, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0xFF, .iconId = { 0xFF, 0xFF, 0xFF, 0xFF }, .talkFlagId = { 0xFF, 0xFF, 0xFF, 0xFF }, diff --git a/src/investigation_segment_1_2.c b/src/investigation_segment_1_2.c index cd9ae97..a09a8e2 100644 --- a/src/investigation_segment_1_2.c +++ b/src/investigation_segment_1_2.c @@ -114,7 +114,7 @@ const struct TalkData gTalkData_1_2[13] = { { .roomId = 0x2, .personId = PERSON_ANIM_APRIL_MAY, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x11, 0x12, 0x13, 0xFF }, .talkFlagId = { 0x13, 0x15, 0x14, 0xFF }, @@ -123,7 +123,7 @@ const struct TalkData gTalkData_1_2[13] = { { .roomId = 0x2, .personId = PERSON_ANIM_APRIL_MAY, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x11, 0x12, 0x13, 0xFF }, .talkFlagId = { 0x16, 0x15, 0x14, 0xFF }, @@ -132,7 +132,7 @@ const struct TalkData gTalkData_1_2[13] = { { .roomId = 0x2, .personId = PERSON_ANIM_APRIL_MAY, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x12, 0x13, 0xFF, 0xFF }, .talkFlagId = { 0x15, 0x14, 0xFF, 0xFF }, @@ -141,7 +141,7 @@ const struct TalkData gTalkData_1_2[13] = { { .roomId = 0x3, .personId = PERSON_ANIM_MARVIN_GROSSBERG, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x14, 0x15, 0x16, 0xFF }, .talkFlagId = { 0x18, 0x19, 0x1A, 0xFF }, @@ -150,7 +150,7 @@ const struct TalkData gTalkData_1_2[13] = { { .roomId = 0x3, .personId = PERSON_ANIM_MARVIN_GROSSBERG, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x14, 0x15, 0x16, 0xFF }, .talkFlagId = { 0x18, 0x19, 0x1A, 0xFF }, @@ -159,7 +159,7 @@ const struct TalkData gTalkData_1_2[13] = { { .roomId = 0x3, .personId = PERSON_ANIM_MARVIN_GROSSBERG, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x14, 0x15, 0x17, 0xFF }, .talkFlagId = { 0x1E, 0x1F, 0x20, 0xFF }, @@ -168,7 +168,7 @@ const struct TalkData gTalkData_1_2[13] = { { .roomId = 0x3, .personId = PERSON_ANIM_MARVIN_GROSSBERG, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x14, 0x15, 0x18, 0x19 }, .talkFlagId = { 0x1E, 0x1F, 0x21, 0x22 }, @@ -177,7 +177,7 @@ const struct TalkData gTalkData_1_2[13] = { { .roomId = 0x4, .personId = PERSON_ANIM_REDD_WHITE, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x1A, 0x1D, 0x1E, 0xFF }, .talkFlagId = { 0x26, 0x27, 0x28, 0xFF }, @@ -186,7 +186,7 @@ const struct TalkData gTalkData_1_2[13] = { { .roomId = 0x4, .personId = PERSON_ANIM_REDD_WHITE, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x1A, 0x1D, 0x1E, 0x16 }, .talkFlagId = { 0x26, 0x27, 0x28, 0x29 }, @@ -195,7 +195,7 @@ const struct TalkData gTalkData_1_2[13] = { { .roomId = 0x4, .personId = PERSON_ANIM_REDD_WHITE, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x1A, 0x1D, 0x1E, 0x16 }, .talkFlagId = { 0x26, 0x27, 0x28, 0x29 }, @@ -204,7 +204,7 @@ const struct TalkData gTalkData_1_2[13] = { { .roomId = 0x4, .personId = PERSON_ANIM_REDD_WHITE, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x1A, 0x1D, 0x1F, 0xFF }, .talkFlagId = { 0x2E, 0x2F, 0x30, 0xFF }, @@ -213,7 +213,7 @@ const struct TalkData gTalkData_1_2[13] = { { .roomId = 0x5, .personId = PERSON_ANIM_BELLBOY, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x1A, 0x1B, 0x1C, 0xFF }, .talkFlagId = { 0x23, 0x24, 0x25, 0xFF }, @@ -222,7 +222,7 @@ const struct TalkData gTalkData_1_2[13] = { { .roomId = 0xFF, .personId = 0xFF, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0xFF, .iconId = { 0xFF, 0xFF, 0xFF, 0xFF }, .talkFlagId = { 0xFF, 0xFF, 0xFF, 0xFF }, diff --git a/src/investigation_segment_2_0.c b/src/investigation_segment_2_0.c index 079e0de..88d048b 100644 --- a/src/investigation_segment_2_0.c +++ b/src/investigation_segment_2_0.c @@ -358,7 +358,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0x6, .personId = PERSON_ANIM_MAYA, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x20, 0x21, 0xFF, 0xFF }, .talkFlagId = { 0x31, 0x32, 0xFF, 0xFF }, @@ -367,7 +367,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0x6, .personId = PERSON_ANIM_MAYA, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x20, 0x22, 0xFF, 0xFF }, .talkFlagId = { 0x33, 0x34, 0xFF, 0xFF }, @@ -376,7 +376,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0x2, .personId = PERSON_ANIM_WILL_POWERS, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x23, 0x24, 0xFF, 0xFF }, .talkFlagId = { 0x35, 0x36, 0xFF, 0xFF }, @@ -385,7 +385,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0x2, .personId = PERSON_ANIM_WILL_POWERS, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x23, 0x24, 0x25, 0xFF }, .talkFlagId = { 0x35, 0x36, 0x37, 0xFF }, @@ -394,7 +394,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0x2, .personId = PERSON_ANIM_WILL_POWERS, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x26, 0x27, 0x24, 0xFF }, .talkFlagId = { 0x38, 0x39, 0x36, 0xFF }, @@ -403,7 +403,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0x7, .personId = PERSON_ANIM_WENDY_OLDBAG, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x28, 0x29, 0xFF, 0xFF }, .talkFlagId = { 0x3A, 0x3B, 0xFF, 0xFF }, @@ -412,7 +412,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0x7, .personId = PERSON_ANIM_WENDY_OLDBAG, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x28, 0x29, 0x2A, 0xFF }, .talkFlagId = { 0x3A, 0x3B, 0x3C, 0xFF }, @@ -421,7 +421,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0x7, .personId = PERSON_ANIM_WENDY_OLDBAG, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x28, 0x29, 0x2B, 0xFF }, .talkFlagId = { 0x3A, 0x3B, 0x3D, 0xFF }, @@ -430,7 +430,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0x7, .personId = PERSON_ANIM_WENDY_OLDBAG, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x28, 0x29, 0x2A, 0x2B }, .talkFlagId = { 0x3A, 0x3B, 0x3C, 0x3D }, @@ -439,7 +439,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0x7, .personId = PERSON_ANIM_WENDY_OLDBAG, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x2C, 0x2B, 0x2A, 0xFF }, .talkFlagId = { 0x3E, 0x3F, 0x40, 0xFF }, @@ -448,7 +448,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0x7, .personId = PERSON_ANIM_WENDY_OLDBAG, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x2C, 0x2B, 0x2A, 0x2D }, .talkFlagId = { 0x3E, 0x3F, 0x40, 0x41 }, @@ -457,7 +457,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0x7, .personId = PERSON_ANIM_WENDY_OLDBAG, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x2C, 0x2B, 0x2D, 0x2E }, .talkFlagId = { 0x3E, 0x3F, 0x41, 0x42 }, @@ -466,7 +466,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0xA, .personId = PERSON_ANIM_GUMSHOE, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x2F, 0x30, 0x27, 0xFF }, .talkFlagId = { 0x43, 0x44, 0x45, 0xFF }, @@ -475,7 +475,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0xA, .personId = PERSON_ANIM_GUMSHOE, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x2F, 0x30, 0x27, 0x31 }, .talkFlagId = { 0x43, 0x44, 0x45, 0x46 }, @@ -484,7 +484,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0xB, .personId = PERSON_ANIM_PENNY_NICHOLS, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x32, 0x29, 0xFF, 0xFF }, .talkFlagId = { 0x47, 0x48, 0xFF, 0xFF }, @@ -493,7 +493,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0xB, .personId = PERSON_ANIM_PENNY_NICHOLS, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x32, 0x29, 0x33, 0xFF }, .talkFlagId = { 0x47, 0x48, 0x49, 0xFF }, @@ -502,7 +502,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0xFF, .personId = 0xFF, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0xFF, .iconId = { 0xFF, 0xFF, 0xFF, 0xFF }, .talkFlagId = { 0xFF, 0xFF, 0xFF, 0xFF }, diff --git a/src/investigation_segment_2_2.c b/src/investigation_segment_2_2.c index ca050c1..b801e3d 100644 --- a/src/investigation_segment_2_2.c +++ b/src/investigation_segment_2_2.c @@ -306,7 +306,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0x6, .personId = PERSON_ANIM_MAYA, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x20, 0x21, 0xFF, 0xFF }, .talkFlagId = { 0x4A, 0x4B, 0xFF, 0xFF }, @@ -315,7 +315,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0x6, .personId = PERSON_ANIM_SUMMONED_MIA, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x20, 0x21, 0xFF, 0xFF }, .talkFlagId = { 0x4C, 0x4D, 0xFF, 0xFF }, @@ -324,7 +324,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0x2, .personId = PERSON_ANIM_WILL_POWERS, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x34, 0x35, 0xFF, 0xFF }, .talkFlagId = { 0x4E, 0x4F, 0xFF, 0xFF }, @@ -333,7 +333,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0x7, .personId = PERSON_ANIM_PENNY_NICHOLS, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x28, 0x34, 0x36, 0xFF }, .talkFlagId = { 0x50, 0x51, 0x52, 0xFF }, @@ -342,7 +342,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0x7, .personId = PERSON_ANIM_WENDY_OLDBAG, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x34, 0x36, 0xFF, 0xFF }, .talkFlagId = { 0x53, 0x54, 0xFF, 0xFF }, @@ -351,7 +351,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0x7, .personId = PERSON_ANIM_WENDY_OLDBAG, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x34, 0x36, 0x46, 0xFF }, .talkFlagId = { 0x55, 0x56, 0x57, 0xFF }, @@ -360,7 +360,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0x8, .personId = PERSON_ANIM_CODY_HACKINS, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x37, 0x24, 0xFF, 0xFF }, .talkFlagId = { 0x58, 0x59, 0xFF, 0xFF }, @@ -369,7 +369,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0x8, .personId = PERSON_ANIM_CODY_HACKINS, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x24, 0x23, 0xFF, 0xFF }, .talkFlagId = { 0x59, 0x5A, 0xFF, 0xFF }, @@ -378,7 +378,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0x9, .personId = PERSON_ANIM_SAL_MANELLA, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x32, 0xFF, 0xFF, 0xFF }, .talkFlagId = { 0x5B, 0xFF, 0xFF, 0xFF }, @@ -387,7 +387,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0x9, .personId = PERSON_ANIM_SAL_MANELLA, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x32, 0x38, 0x39, 0xFF }, .talkFlagId = { 0x5B, 0x5C, 0x5D, 0xFF }, @@ -396,7 +396,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0x9, .personId = PERSON_ANIM_CODY_HACKINS, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x24, 0x23, 0xFF, 0xFF }, .talkFlagId = { 0x5E, 0x5F, 0xFF, 0xFF }, @@ -405,7 +405,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0x9, .personId = PERSON_ANIM_CODY_HACKINS, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x24, 0x23, 0xFF, 0xFF }, .talkFlagId = { 0x60, 0x62, 0xFF, 0xFF }, @@ -414,7 +414,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0x9, .personId = PERSON_ANIM_CODY_HACKINS, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x24, 0x23, 0x3A, 0xFF }, .talkFlagId = { 0x60, 0x62, 0x61, 0xFF }, @@ -423,7 +423,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0xD, .personId = PERSON_ANIM_DEE_VASQUEZ, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x32, 0x24, 0x35, 0xFF }, .talkFlagId = { 0x63, 0x64, 0x65, 0xFF }, @@ -432,7 +432,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0xD, .personId = PERSON_ANIM_DEE_VASQUEZ, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x32, 0x24, 0x35, 0x3B }, .talkFlagId = { 0x63, 0x64, 0x65, 0x66 }, @@ -441,7 +441,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0xD, .personId = PERSON_ANIM_PENNY_NICHOLS, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x34, 0x3C, 0xFF, 0xFF }, .talkFlagId = { 0x67, 0x68, 0xFF, 0xFF }, @@ -450,7 +450,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0xD, .personId = PERSON_ANIM_PENNY_NICHOLS, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x34, 0x3C, 0x47, 0xFF }, .talkFlagId = { 0x67, 0x68, 0x69, 0xFF }, @@ -459,7 +459,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0xFF, .personId = 0xFF, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0xFF, .iconId = { 0xFF, 0xFF, 0xFF, 0xFF }, .talkFlagId = { 0xFF, 0xFF, 0xFF, 0xFF }, diff --git a/src/investigation_segment_2_4.c b/src/investigation_segment_2_4.c index 536edae..adf7fbc 100644 --- a/src/investigation_segment_2_4.c +++ b/src/investigation_segment_2_4.c @@ -193,7 +193,7 @@ const struct TalkData gTalkData_2_4[13] = { { .roomId = 0x6, .personId = PERSON_ANIM_MAYA, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x24, 0x3D, 0x21, 0xFF }, .talkFlagId = { 0x6A, 0x6B, 0x6C, 0xFF }, @@ -202,7 +202,7 @@ const struct TalkData gTalkData_2_4[13] = { { .roomId = 0x2, .personId = PERSON_ANIM_WILL_POWERS, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x3E, 0x3F, 0x3C, 0xFF }, .talkFlagId = { 0x6D, 0x6E, 0x6F, 0xFF }, @@ -211,7 +211,7 @@ const struct TalkData gTalkData_2_4[13] = { { .roomId = 0x7, .personId = PERSON_ANIM_WENDY_OLDBAG, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x3E, 0x3F, 0x3C, 0xFF }, .talkFlagId = { 0x70, 0x71, 0x72, 0xFF }, @@ -220,7 +220,7 @@ const struct TalkData gTalkData_2_4[13] = { { .roomId = 0x7, .personId = PERSON_ANIM_WENDY_OLDBAG, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x3E, 0x3F, 0x3C, 0x40 }, .talkFlagId = { 0x70, 0x71, 0x72, 0x7E }, @@ -229,7 +229,7 @@ const struct TalkData gTalkData_2_4[13] = { { .roomId = 0x8, .personId = PERSON_ANIM_GUMSHOE, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x41, 0x42, 0x43, 0xFF }, .talkFlagId = { 0x73, 0x74, 0x75, 0xFF }, @@ -238,7 +238,7 @@ const struct TalkData gTalkData_2_4[13] = { { .roomId = 0x8, .personId = PERSON_ANIM_GUMSHOE, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x42, 0x43, 0xFF, 0xFF }, .talkFlagId = { 0x74, 0x75, 0xFF, 0xFF }, @@ -247,7 +247,7 @@ const struct TalkData gTalkData_2_4[13] = { { .roomId = 0x9, .personId = PERSON_ANIM_PENNY_NICHOLS, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x3C, 0x44, 0xFF, 0xFF }, .talkFlagId = { 0x76, 0x78, 0xFF, 0xFF }, @@ -256,7 +256,7 @@ const struct TalkData gTalkData_2_4[13] = { { .roomId = 0x9, .personId = PERSON_ANIM_PENNY_NICHOLS, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x3C, 0x44, 0x45, 0xFF }, .talkFlagId = { 0x76, 0x78, 0x79, 0xFF }, @@ -265,7 +265,7 @@ const struct TalkData gTalkData_2_4[13] = { { .roomId = 0x9, .personId = PERSON_ANIM_PENNY_NICHOLS, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x3C, 0x44, 0x40, 0xFF }, .talkFlagId = { 0x76, 0x78, 0x7A, 0xFF }, @@ -274,7 +274,7 @@ const struct TalkData gTalkData_2_4[13] = { { .roomId = 0x9, .personId = PERSON_ANIM_PENNY_NICHOLS, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x3C, 0x44, 0x45, 0x40 }, .talkFlagId = { 0x76, 0x78, 0x79, 0x7A }, @@ -283,7 +283,7 @@ const struct TalkData gTalkData_2_4[13] = { { .roomId = 0x9, .personId = PERSON_ANIM_PENNY_NICHOLS, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x3C, 0x44, 0x45, 0x40 }, .talkFlagId = { 0x76, 0x78, 0x79, 0x77 }, @@ -292,7 +292,7 @@ const struct TalkData gTalkData_2_4[13] = { { .roomId = 0xC, .personId = PERSON_ANIM_DEE_VASQUEZ, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x3C, 0x29, 0x3F, 0xFF }, .talkFlagId = { 0x7B, 0x7C, 0x7D, 0xFF }, @@ -301,7 +301,7 @@ const struct TalkData gTalkData_2_4[13] = { { .roomId = 0xFF, .personId = 0xFF, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0xFF, .iconId = { 0xFF, 0xFF, 0xFF, 0xFF }, .talkFlagId = { 0xFF, 0xFF, 0xFF, 0xFF }, diff --git a/src/investigation_segment_3_0.c b/src/investigation_segment_3_0.c index 6709a38..0aeb51d 100644 --- a/src/investigation_segment_3_0.c +++ b/src/investigation_segment_3_0.c @@ -484,7 +484,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x6, .personId = PERSON_ANIM_MAYA, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x48, 0x49, 0xFF, 0xFF }, .talkFlagId = { 0x7F, 0x80, 0xFF, 0xFF }, @@ -493,7 +493,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x6, .personId = PERSON_ANIM_MAYA, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x48, 0x49, 0xFF, 0xFF }, .talkFlagId = { 0x81, 0x82, 0xFF, 0xFF }, @@ -502,7 +502,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x2, .personId = PERSON_ANIM_EDGEWORTH, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x4A, 0x4B, 0xFF, 0xFF }, .talkFlagId = { 0x83, 0x84, 0xFF, 0xFF }, @@ -511,7 +511,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x2, .personId = PERSON_ANIM_EDGEWORTH, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x4A, 0x4B, 0x4C, 0xFF }, .talkFlagId = { 0x83, 0x84, 0x85, 0xFF }, @@ -520,7 +520,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x2, .personId = PERSON_ANIM_EDGEWORTH, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x4A, 0x4B, 0xFF, 0xFF }, .talkFlagId = { 0x86, 0x87, 0xFF, 0xFF }, @@ -529,7 +529,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x2, .personId = PERSON_ANIM_EDGEWORTH, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x4D, 0xFF, 0xFF, 0xFF }, .talkFlagId = { 0x88, 0xFF, 0xFF, 0xFF }, @@ -538,7 +538,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x2, .personId = PERSON_ANIM_EDGEWORTH, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x4D, 0x4E, 0x4F, 0xFF }, .talkFlagId = { 0x88, 0x89, 0x8A, 0xFF }, @@ -547,7 +547,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x10, .personId = PERSON_ANIM_GUMSHOE, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x4A, 0x50, 0x51, 0xFF }, .talkFlagId = { 0x8B, 0x8C, 0x8D, 0xFF }, @@ -556,7 +556,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x10, .personId = PERSON_ANIM_GUMSHOE, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x4A, 0x50, 0x51, 0x52 }, .talkFlagId = { 0x8B, 0x8C, 0x8D, 0x8E }, @@ -565,7 +565,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x11, .personId = PERSON_ANIM_LARRY_BUTZ, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x4A, 0x53, 0xFF, 0xFF }, .talkFlagId = { 0x8F, 0x90, 0xFF, 0xFF }, @@ -574,7 +574,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x11, .personId = PERSON_ANIM_LARRY_BUTZ, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x4A, 0x53, 0x50, 0xFF }, .talkFlagId = { 0x8F, 0x90, 0x91, 0xFF }, @@ -583,7 +583,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x11, .personId = PERSON_ANIM_LARRY_BUTZ, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x4A, 0x53, 0x54, 0xFF }, .talkFlagId = { 0x8F, 0x90, 0x92, 0xFF }, @@ -592,7 +592,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x11, .personId = PERSON_ANIM_LARRY_BUTZ, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x4A, 0x53, 0x50, 0x54 }, .talkFlagId = { 0x8F, 0x90, 0x91, 0x92 }, @@ -601,7 +601,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x12, .personId = PERSON_ANIM_LOTTA_HART, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x4A, 0x55, 0xFF, 0xFF }, .talkFlagId = { 0x93, 0x94, 0xFF, 0xFF }, @@ -610,7 +610,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x12, .personId = PERSON_ANIM_LOTTA_HART, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x4A, 0x56, 0xFF, 0xFF }, .talkFlagId = { 0x95, 0x97, 0xFF, 0xFF }, @@ -619,7 +619,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x12, .personId = PERSON_ANIM_LOTTA_HART, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x4A, 0x56, 0x57, 0xFF }, .talkFlagId = { 0x95, 0x97, 0x96, 0xFF }, @@ -628,7 +628,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0xE, .personId = PERSON_ANIM_GUMSHOE, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x58, 0x59, 0xFF, 0xFF }, .talkFlagId = { 0x98, 0x99, 0xFF, 0xFF }, @@ -637,7 +637,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0xE, .personId = PERSON_ANIM_GUMSHOE, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x58, 0x59, 0x5A, 0xFF }, .talkFlagId = { 0x98, 0x99, 0x9A, 0xFF }, @@ -646,7 +646,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0xE, .personId = PERSON_ANIM_GUMSHOE, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x58, 0x59, 0x5A, 0x5B }, .talkFlagId = { 0x98, 0x99, 0x9A, 0x9B }, @@ -655,7 +655,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0xE, .personId = PERSON_ANIM_GUMSHOE, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x5C, 0x5D, 0x50, 0xFF }, .talkFlagId = { 0xA0, 0xA1, 0xA2, 0xFF }, @@ -664,7 +664,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x3, .personId = PERSON_ANIM_MARVIN_GROSSBERG, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x4A, 0x5E, 0xFF, 0xFF }, .talkFlagId = { 0x9C, 0x9D, 0xFF, 0xFF }, @@ -673,7 +673,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x3, .personId = PERSON_ANIM_MARVIN_GROSSBERG, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x4A, 0x5E, 0x5F, 0xFF }, .talkFlagId = { 0x9C, 0x9D, 0x9E, 0xFF }, @@ -682,7 +682,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x3, .personId = PERSON_ANIM_MARVIN_GROSSBERG, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x4A, 0x5E, 0x5F, 0x4D }, .talkFlagId = { 0x9C, 0x9D, 0x9E, 0x9F }, @@ -691,7 +691,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0xFF, .personId = 0xFF, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0xFF, .iconId = { 0xFF, 0xFF, 0xFF, 0xFF }, .talkFlagId = { 0xFF, 0xFF, 0xFF, 0xFF }, diff --git a/src/investigation_segment_3_2.c b/src/investigation_segment_3_2.c index bb5eddb..fb92270 100644 --- a/src/investigation_segment_3_2.c +++ b/src/investigation_segment_3_2.c @@ -377,7 +377,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0x6, .personId = PERSON_ANIM_MAYA, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x48, 0x49, 0xFF, 0xFF }, .talkFlagId = { 0xA5, 0xA6, 0xFF, 0xFF }, @@ -386,7 +386,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0x2, .personId = PERSON_ANIM_MAYA, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x61, 0x62, 0xFF, 0xFF }, .talkFlagId = { 0xA3, 0xA4, 0xFF, 0xFF }, @@ -395,7 +395,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0x2, .personId = PERSON_ANIM_MAYA, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x48, 0x49, 0xFF, 0xFF }, .talkFlagId = { 0xA7, 0xA8, 0xFF, 0xFF }, @@ -404,7 +404,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0x10, .personId = PERSON_ANIM_LOTTA_HART, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x63, 0x54, 0x64, 0xFF }, .talkFlagId = { 0xA9, 0xAA, 0xAB, 0xFF }, @@ -413,7 +413,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0x11, .personId = PERSON_ANIM_LARRY_BUTZ, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x50, 0x65, 0xFF, 0xFF }, .talkFlagId = { 0xAC, 0xAD, 0xFF, 0xFF }, @@ -422,7 +422,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0x11, .personId = PERSON_ANIM_LARRY_BUTZ, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x50, 0x65, 0x66, 0xFF }, .talkFlagId = { 0xAC, 0xAD, 0xAE, 0xFF }, @@ -431,7 +431,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0x12, .personId = PERSON_ANIM_GUMSHOE, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x5D, 0x67, 0x68, 0xFF }, .talkFlagId = { 0xAF, 0xB0, 0xB1, 0xFF }, @@ -440,7 +440,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0x12, .personId = PERSON_ANIM_LOTTA_HART, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x4A, 0x54, 0xFF, 0xFF }, .talkFlagId = { 0xB3, 0xB2, 0xFF, 0xFF }, @@ -449,7 +449,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0x12, .personId = PERSON_ANIM_LOTTA_HART, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x4A, 0x69, 0xFF, 0xFF }, .talkFlagId = { 0xB3, 0xB4, 0xFF, 0xFF }, @@ -458,7 +458,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0x14, .personId = PERSON_ANIM_YANNI_YOGI, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x6D, 0x6E, 0xFF, 0xFF }, .talkFlagId = { 0xB5, 0xB6, 0xFF, 0xFF }, @@ -467,7 +467,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0x14, .personId = PERSON_ANIM_YANNI_YOGI, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x6D, 0x6E, 0x6F, 0xFF }, .talkFlagId = { 0xB5, 0xB6, 0xB7, 0xFF }, @@ -476,7 +476,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0x14, .personId = PERSON_ANIM_YANNI_YOGI, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x6D, 0x6E, 0x70, 0xFF }, .talkFlagId = { 0xB5, 0xB6, 0xB8, 0xFF }, @@ -485,7 +485,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0x14, .personId = PERSON_ANIM_YANNI_YOGI, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x6D, 0x6E, 0x6F, 0x70 }, .talkFlagId = { 0xB5, 0xB6, 0xB7, 0xB8 }, @@ -494,7 +494,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0xE, .personId = PERSON_ANIM_GUMSHOE, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x6A, 0x54, 0xFF, 0xFF }, .talkFlagId = { 0xB9, 0xBA, 0xFF, 0xFF }, @@ -503,7 +503,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0xE, .personId = PERSON_ANIM_GUMSHOE, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x6A, 0x6B, 0xFF, 0xFF }, .talkFlagId = { 0xB9, 0xBB, 0xFF, 0xFF }, @@ -512,7 +512,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0xE, .personId = PERSON_ANIM_GUMSHOE, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x6C, 0x4D, 0xFF, 0xFF }, .talkFlagId = { 0xBC, 0xBD, 0xFF, 0xFF }, @@ -521,7 +521,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0xF, .personId = PERSON_ANIM_MAYA, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x71, 0x72, 0x73, 0xFF }, .talkFlagId = { 0xBE, 0xBF, 0xC0, 0xFF }, @@ -530,7 +530,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0xFF, .personId = 0xFF, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0xFF, .iconId = { 0xFF, 0xFF, 0xFF, 0xFF }, .talkFlagId = { 0xFF, 0xFF, 0xFF, 0xFF }, diff --git a/src/investigation_segment_3_4.c b/src/investigation_segment_3_4.c index e4cfe7a..bf791fc 100644 --- a/src/investigation_segment_3_4.c +++ b/src/investigation_segment_3_4.c @@ -122,7 +122,7 @@ const struct TalkData gTalkData_3_4[12] = { { .roomId = 0x6, .personId = PERSON_ANIM_LARRY_BUTZ, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x63, 0x50, 0xFF, 0xFF }, .talkFlagId = { 0xC1, 0xC2, 0xFF, 0xFF }, @@ -131,7 +131,7 @@ const struct TalkData gTalkData_3_4[12] = { { .roomId = 0x6, .personId = PERSON_ANIM_LARRY_BUTZ, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x63, 0x50, 0x74, 0xFF }, .talkFlagId = { 0xC1, 0xC2, 0xC3, 0xFF }, @@ -140,7 +140,7 @@ const struct TalkData gTalkData_3_4[12] = { { .roomId = 0x6, .personId = PERSON_ANIM_LARRY_BUTZ, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x63, 0x50, 0x74, 0x75 }, .talkFlagId = { 0xC1, 0xC2, 0xC3, 0xC4 }, @@ -149,7 +149,7 @@ const struct TalkData gTalkData_3_4[12] = { { .roomId = 0x6, .personId = PERSON_ANIM_MAYA, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x48, 0x49, 0xFF, 0xFF }, .talkFlagId = { 0xC5, 0xC6, 0xFF, 0xFF }, @@ -158,7 +158,7 @@ const struct TalkData gTalkData_3_4[12] = { { .roomId = 0x2, .personId = PERSON_ANIM_EDGEWORTH, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x76, 0x77, 0xFF, 0xFF }, .talkFlagId = { 0xC7, 0xC8, 0xFF, 0xFF }, @@ -167,7 +167,7 @@ const struct TalkData gTalkData_3_4[12] = { { .roomId = 0x2, .personId = PERSON_ANIM_EDGEWORTH, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x76, 0x77, 0x78, 0xFF }, .talkFlagId = { 0xC7, 0xC8, 0xC9, 0xFF }, @@ -176,7 +176,7 @@ const struct TalkData gTalkData_3_4[12] = { { .roomId = 0x2, .personId = PERSON_ANIM_EDGEWORTH, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x76, 0x77, 0x78, 0x79 }, .talkFlagId = { 0xC7, 0xC8, 0xC9, 0xCA }, @@ -185,7 +185,7 @@ const struct TalkData gTalkData_3_4[12] = { { .roomId = 0xF, .personId = PERSON_ANIM_MANFRED_VONKARMA, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x50, 0x5D, 0xFF, 0xFF }, .talkFlagId = { 0xCB, 0xCC, 0xFF, 0xFF }, @@ -194,7 +194,7 @@ const struct TalkData gTalkData_3_4[12] = { { .roomId = 0x3, .personId = PERSON_ANIM_MARVIN_GROSSBERG, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x7A, 0x7B, 0xFF, 0xFF }, .talkFlagId = { 0xCD, 0xCE, 0xFF, 0xFF }, @@ -203,7 +203,7 @@ const struct TalkData gTalkData_3_4[12] = { { .roomId = 0x3, .personId = PERSON_ANIM_MARVIN_GROSSBERG, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x7A, 0x7B, 0x77, 0xFF }, .talkFlagId = { 0xCD, 0xCE, 0xCF, 0xFF }, @@ -212,7 +212,7 @@ const struct TalkData gTalkData_3_4[12] = { { .roomId = 0x3, .personId = PERSON_ANIM_MARVIN_GROSSBERG, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x7A, 0x7B, 0x77, 0x7C }, .talkFlagId = { 0xCD, 0xCE, 0xCF, 0xD0 }, @@ -221,7 +221,7 @@ const struct TalkData gTalkData_3_4[12] = { { .roomId = 0xFF, .personId = 0xFF, - .unk2 = 0xFF, + .unused2 = 0xFF, .enableFlag = 0xFF, .iconId = { 0xFF, 0xFF, 0xFF, 0xFF }, .talkFlagId = { 0xFF, 0xFF, 0xFF, 0xFF }, diff --git a/src/save_processes.c b/src/save_processes.c index 3a97b97..a21643a 100644 --- a/src/save_processes.c +++ b/src/save_processes.c @@ -428,7 +428,7 @@ void SaveGameExitSaveScreen(struct Main *main) main->Bg256_scroll_y = gSaveDataBuffer.main.Bg256_scroll_y; main->Bg256_pos_x = gSaveDataBuffer.main.Bg256_pos_x; main->Bg256_pos_y = gSaveDataBuffer.main.Bg256_pos_y; - main->unk38 = gSaveDataBuffer.main.unk38; + main->unused38 = gSaveDataBuffer.main.unused38; main->Bg256_dir = gSaveDataBuffer.main.Bg256_dir; main->horizontolBGScrollSpeed = gSaveDataBuffer.main.horizontolBGScrollSpeed; main->verticalBGScrollSpeed = gSaveDataBuffer.main.verticalBGScrollSpeed; diff --git a/src/script_commands2.c b/src/script_commands2.c index 8137213..7aea782 100644 --- a/src/script_commands2.c +++ b/src/script_commands2.c @@ -29,7 +29,7 @@ struct SpotSelectData /* +0x20 */ u16 firstAreaSection; /* +0x22 */ u16 secondAreaSection; /* +0x24 */ u16 defaultSection; - /* +0x26 */ u16 unk26; // Unused, called a dummy in unity + /* +0x26 */ u16 unused26; // Unused, called a dummy in unity /* +0x28 */ u8 left; /* +0x29 */ u8 top; /* +0x2A */ u8 right; @@ -178,7 +178,7 @@ static const struct SpotSelectData gSpotSelectData[] = { .firstAreaSection = 0xA3, .secondAreaSection = 0xA2, .defaultSection = 0xA1, - .unk26 = 0, + .unused26 = 0, .left = 26, .top = 4, .right = 188, @@ -222,7 +222,7 @@ static const struct SpotSelectData gSpotSelectData[] = { .firstAreaSection = 0xE9, .secondAreaSection = 0xE8, .defaultSection = 0xE7, - .unk26 = 0, + .unused26 = 0, .left = 2, .top = 2, .right = 222, @@ -266,7 +266,7 @@ static const struct SpotSelectData gSpotSelectData[] = { .firstAreaSection = 0xEC, .secondAreaSection = 0xEB, .defaultSection = 0xEB, - .unk26 = 0, + .unused26 = 0, .left = 2, .top = 2, .right = 222, @@ -310,7 +310,7 @@ static const struct SpotSelectData gSpotSelectData[] = { .firstAreaSection = 0xEF, .secondAreaSection = 0xEC, .defaultSection = 0xED, - .unk26 = 0, + .unused26 = 0, .left = 2, .top = 2, .right = 222, @@ -354,7 +354,7 @@ static const struct SpotSelectData gSpotSelectData[] = { .firstAreaSection = 0xDD, .secondAreaSection = 0xDB, .defaultSection = 0xDC, - .unk26 = 0, + .unused26 = 0, .left = 2, .top = 2, .right = 222, @@ -398,7 +398,7 @@ static const struct SpotSelectData gSpotSelectData[] = { .firstAreaSection = 0xD8, .secondAreaSection = 0xD6, .defaultSection = 0xD7, - .unk26 = 0, + .unused26 = 0, .left = 2, .top = 2, .right = 222, @@ -442,7 +442,7 @@ static const struct SpotSelectData gSpotSelectData[] = { .firstAreaSection = 0xC4, .secondAreaSection = 0xC2, .defaultSection = 0xC3, - .unk26 = 0, + .unused26 = 0, .left = 2, .top = 2, .right = 222, diff --git a/src/script_main.c b/src/script_main.c index b4e9fa1..0c4fb14 100644 --- a/src/script_main.c +++ b/src/script_main.c @@ -174,7 +174,7 @@ void InitScriptSection(struct ScriptContext *scriptCtx) scriptCtx->textY = 0; if (!(gMain.process[GAME_PROCESS] == INVESTIGATION_PROCESS && gMain.process[GAME_PROCESS_STATE] == INVESTIGATION_TALK)) scriptCtx->textSkip = 0; - scriptCtx->unk15 = 0; + scriptCtx->unused15 = 0; scriptCtx->paragraphSkipDelayCounter = 8; scriptCtx->soundCueSkip = 1; scriptCtx->currentSoundCue = 0; diff --git a/src/title_processes.c b/src/title_processes.c index 20c93c7..ccf8d0a 100644 --- a/src/title_processes.c +++ b/src/title_processes.c @@ -94,7 +94,7 @@ void TitleScreenProcess(struct Main *main) gInvestigation.pointerFrameCounter = 0; gInvestigation.pointerFrame = 2; main->selectedButton = 0; - main->unk19C |= 4; + main->unused19C |= 4; main->tilemapUpdateBits = 9; StartHardwareBlend(1, 1, 1, 0x1F); SET_PROCESS_PTR(TITLE_SCREEN_PROCESS, 2, 0, 0, main); From e23712555459543fee1a5927fcf7a6be18297f43 Mon Sep 17 00:00:00 2001 From: Missingmew Date: Sun, 10 Sep 2023 21:27:26 +0200 Subject: [PATCH 12/17] Revert "no unknown struct members of interest left" This reverts commit 39d5641a75b6a6d33a2193efdc1af418b1fa482f. --- include/animation.h | 4 ++- include/background.h | 1 + include/court.h | 2 +- include/court_record.h | 2 +- include/investigation.h | 2 +- include/main.h | 8 ++--- include/script.h | 10 +++--- src/animation.c | 54 ++++++++++++++++----------------- src/bg.c | 8 ++--- src/court.c | 4 +-- src/court_record.c | 2 +- src/investigation_segment_1_0.c | 28 ++++++++--------- src/investigation_segment_1_2.c | 26 ++++++++-------- src/investigation_segment_2_0.c | 34 ++++++++++----------- src/investigation_segment_2_2.c | 36 +++++++++++----------- src/investigation_segment_2_4.c | 26 ++++++++-------- src/investigation_segment_3_0.c | 48 ++++++++++++++--------------- src/investigation_segment_3_2.c | 36 +++++++++++----------- src/investigation_segment_3_4.c | 24 +++++++-------- src/save_processes.c | 2 +- src/script_commands2.c | 16 +++++----- src/script_main.c | 2 +- src/title_processes.c | 2 +- 23 files changed, 190 insertions(+), 187 deletions(-) diff --git a/include/animation.h b/include/animation.h index 8d5203c..3be2ae0 100644 --- a/include/animation.h +++ b/include/animation.h @@ -32,6 +32,7 @@ struct AnimationInfo { /* +0x00 */ u16 animId; /* +0x02 */ u8 personId; + /* +0x03 */ u8 unk3; // padding? /* +0x04 */ s16 xOrigin; /* +0x06 */ s16 yOrigin; /* +0x08 */ u8 *volatile animFrameDataStartPtr; // !! THESE 4 POINTERS ARE VOLATILE TO MATCH MoveAnimationTilesToRam AND THAT COULD BE INCORRECT @@ -75,6 +76,7 @@ struct AnimationBackupStruct { /* +0x00 */ u16 animId; /* +0x02 */ u8 personId; + /* +0x03 */ u8 unk3; // padding? /* +0x04 */ s16 xOrigin; /* +0x06 */ s16 yOrigin; /* +0x08 */ u8 * animFrameDataStartPtr; @@ -93,7 +95,7 @@ struct PersonAnimationData /* +0x00 */ u8* gfxData; /* +0x04 */ u8* frameData; /* +0x08 */ u16 spriteCount; - /* +0x0A */ u16 unusedA; // padding? + /* +0x0A */ u16 unkA; // padding? }; struct AnimationData diff --git a/include/background.h b/include/background.h index 0423d67..6daac87 100644 --- a/include/background.h +++ b/include/background.h @@ -49,6 +49,7 @@ struct CourtScroll /* +0x00 */ u8 * frameDataPtr; /* +0x04 */ u16 state; /* +0x06 */ u8 scrollMode; + /* +0x07 */ u8 unk7; // padding /* +0x08 */ u16 scrollingPersonAnimId; /* +0x0A */ u16 animOffset; /* +0x0C */ s16 frameCounter; diff --git a/include/court.h b/include/court.h index 58d9b84..301823b 100644 --- a/include/court.h +++ b/include/court.h @@ -9,7 +9,7 @@ struct TestimonyStruct /* +0x03 */ u8 presentPromptY; // unity AA4: pos_y_tukitukeru /* +0x04 */ u16 healthPointX; // unity AA4: pos_x_rest /* +0x06 */ u8 testimonyAnimMoveAmount; // unity AA4: add - /* +0x07 */ u8 unused7; // unity AA4: dm00 filler dummy + /* +0x07 */ u8 unk7; // unity AA4: dm00 filler dummy }; extern struct TestimonyStruct gTestimony; diff --git a/include/court_record.h b/include/court_record.h index 6af413f..adf62bf 100644 --- a/include/court_record.h +++ b/include/court_record.h @@ -14,7 +14,7 @@ struct CourtRecord /* +0x08 */ u8 recordArrowFrame; // unity AA4: arrow_type /* +0x09 */ u8 recordArrowCounter; // unity AA4: arrow_timer /* +0x0A */ bool8 windowIsSaveScreen; // unity AA4: win_flag - /* +0x0B */ u8 unusedB; // unity AA4: win_type // unused + /* +0x0B */ u8 unkB; // unity AA4: win_type // unused /* +0x0C */ u8 flags; // unity AA4: page_status /* +0x0D */ u8 selectedItem; // unity AA4: page_now /* +0x0E */ u8 displayItemCount; // unity AA4: page_now_max diff --git a/include/investigation.h b/include/investigation.h index e8892f9..158fde5 100644 --- a/include/investigation.h +++ b/include/investigation.h @@ -8,7 +8,7 @@ struct TalkData { /* +0x00 */ u8 roomId; /* +0x01 */ u8 personId; - /* +0x02 */ u8 unused2; // called dm in unity? probably means dummy, unused + /* +0x02 */ u8 unk2; // called dm in unity? probably means dummy, unused /* +0x03 */ u8 enableFlag; // en- or disables this specific set of talk data, allows for multiple sets for one character in one room /* +0x04 */ u8 iconId[0x4]; /* +0x08 */ u8 talkFlagId[0x4]; diff --git a/include/main.h b/include/main.h index eb2290c..320d9b9 100644 --- a/include/main.h +++ b/include/main.h @@ -47,14 +47,14 @@ struct Main /* +0x028 */ u16 currentBG; // BG related code not in GlobalWork struct, this might be another struct on its own but i'm not sure /* +0x02A */ s16 previousBG; // probably wrong /* +0x02C */ s8 currentBgStripe; // maybe Bg256_rno_0? - /* +0x02D */ u8 unused2D; // unused field maybe Bg256_SP_Flag? + /* +0x02D */ u8 unk2D; // unused field maybe Bg256_SP_Flag? /* +0x02E */ bool8 isBGScrolling; // unity AA4: Bg256_scroll_flag /* +0x02F */ u8 Bg256_stop_line; // unity AA4: Bg256_stop_line /* +0x030 */ s16 Bg256_scroll_x; // unity AA4: Bg256_scroll_x /* +0x032 */ s16 Bg256_scroll_y; // unity AA4: Bg256_scroll_y /* +0x034 */ s16 Bg256_pos_x; // unity AA4: Bg256_pos_x /* +0x036 */ s16 Bg256_pos_y; // unity AA4: Bg256_pos_y - /* +0x038 */ u16 unused38; // unity AA4: Bg256_add? unused but is background related 100% + /* +0x038 */ u16 unk38; // unity AA4: Bg256_add? unused but is background related 100% /* +0x03A */ s16 Bg256_dir; // unity AA4: Bg256_dir /* +0x03C */ s8 horizontolBGScrollSpeed; // unity AA4: Bg256_scroll_speed_x /* +0x03D */ s8 verticalBGScrollSpeed; // unity AA4: Bg256_scroll_speed_y @@ -80,7 +80,7 @@ struct Main /* +0x088 */ u8 damageFrame; // unity: Rest_type /* +0x089 */ u8 damageFrameTimer; // unity: Rest_timer /* +0x08A */ u8 previousHealth; // unity: rest_old - /* +0x08B */ u8 unused8B; // unused + /* +0x08B */ u8 unk8B; // unused /* +0x08C */ u8 currentRoomId; // unity: Room? uint in unity /* +0x08D */ u8 scenarioIdx; // unity: scenario, actually the script you're running /* +0x08E */ u8 caseEnabledFlags; // unity: Scenario_enable, whetever a case is enabled or not, unity names suck @@ -92,7 +92,7 @@ struct Main /* +0x0B8 */ u32 talkEndFlags[8]; // unity: talk_end_flag /* +0x0D8 */ u8 roomData[24][8]; // unity: Map_data //TODO: first size might be wrong /* +0x198 */ u32 soundFlags; - /* +0x19C */ u32 unused19C; // bit 2 is set, never used + /* +0x19C */ u32 unk19C; // bit 2 is set, never used }; struct IORegisters diff --git a/include/script.h b/include/script.h index d58b06d..c0832aa 100644 --- a/include/script.h +++ b/include/script.h @@ -22,7 +22,7 @@ struct ScriptContext /* +0x12 */ u8 fullscreenTextX; /* +0x13 */ u8 textSkip; /* +0x14 */ u8 paragraphSkipDelayCounter; // unity AA4: speed_timer? - /* +0x15 */ u8 unused15; // unity AA4: speed_time? // set once never used + /* +0x15 */ u8 unk15; // unity AA4: speed_time? // set once never used /* +0x16 */ u8 soundCueSkip; // unity AA4: moji_cnt /* +0x17 */ u8 currentSoundCue; // unity AA4: moji_se /* +0x18 */ s16 textXOffset; // unity AA4: plate_pos_x @@ -39,9 +39,9 @@ struct ScriptContext /* +0x2A */ u16 fullscreenTextYOffset; // unity: AA4: sel_pos_y /* +0x2C */ u16 holdItSection; // unity AA4: tukkomi_no /* +0x2E */ u8 holdItFlag; // unity AA4: tukkomi_flag - /* +0x2F */ u8 unused2F; // unity AA4: moji? // unused - /* +0x30 */ u8 unused30; // unity AA4: houtei_page? // unused - /* +0x31 */ u8 unused31; // unity AA4: plate_set_flag? // unused + /* +0x2F */ u8 unk2F; // unity AA4: moji? // unused + /* +0x30 */ u8 unk30; // unity AA4: houtei_page? // unused + /* +0x31 */ u8 unk31; // unity AA4: plate_set_flag? // unused /* +0x32 */ u8 personAnimPauseCounter; // unity: rt_wait_timer /* +0x33 */ bool8 slamDesk; // unity: desk_attack /* +0x34 */ u8 textboxNameId; // unity: speaker_id @@ -50,7 +50,7 @@ struct ScriptContext /* +0x37 */ u8 textboxDownArrowDelayCounter; // unity AA4: enter_type_timer /* +0x38 */ u8 textboxState; // unity: mess_win_rno /* +0x39 */ u8 fullscreenCursorPos; // unity AA4: cursol - /* +0x3A */ u8 unused3A; // unity AA4: add_y, used but does nothing + /* +0x3A */ u8 unk3A; // unity AA4: add_y, used but does nothing /* +0x3B */ u8 textboxYPos; // unity AA4: frame_y /* +0x3C */ u8 * mapMarkerVramPtr; // unity AA4: Expl_now_vram_addr? }; diff --git a/src/animation.c b/src/animation.c index a0a7c8f..56845a0 100644 --- a/src/animation.c +++ b/src/animation.c @@ -11,7 +11,7 @@ #include "constants/process.h" #include "constants/animation_offsets.h" -#define DUMMYPERSON { .gfxData = 0, .frameData = 0, .spriteCount = 0, .unusedA = 0 } +#define DUMMYPERSON { .gfxData = 0, .frameData = 0, .spriteCount = 0, .unkA = 0 } #define DUMMYANIMATION { .gfxData = 0, .vramPtr = 0, .frameData = 0, .xOrigin = 0, .yOrigin = 0, .paletteSlot = 0, .spriteCount = 0, .priority = 0, .flags = 0x0, } const struct PersonAnimationData gPersonAnimData[] = { @@ -21,52 +21,52 @@ const struct PersonAnimationData gPersonAnimData[] = { .gfxData = gGfxPixAnimationChar01, .frameData = gGfxSeqAnimationChar01, .spriteCount = 37, - .unusedA = 0x0, + .unkA = 0x0, }, [PERSON_ANIM_DUMMY03] = DUMMYPERSON, [PERSON_ANIM_MAYA] = { .gfxData = gGfxPixAnimationChar02, .frameData = gGfxSeqAnimationChar02, .spriteCount = 28, - .unusedA = 0x0, + .unkA = 0x0, }, [PERSON_ANIM_SUMMONED_MIA] = { .gfxData = gGfxPixAnimationChar03, .frameData = gGfxSeqAnimationChar03, .spriteCount = 28, - .unusedA = 0x0, + .unkA = 0x0, }, [PERSON_ANIM_DUMMY06] = DUMMYPERSON, [PERSON_ANIM_MIA] = { .gfxData = gGfxPixAnimationChar04, .frameData = gGfxSeqAnimationChar04, .spriteCount = 28, - .unusedA = 0x0, + .unkA = 0x0, }, [PERSON_ANIM_JUDGE] = { .gfxData = gGfxPixAnimationChar05, .frameData = gGfxSeqAnimationChar05, .spriteCount = 19, - .unusedA = 0x0, + .unkA = 0x0, }, [PERSON_ANIM_EDGEWORTH] = { .gfxData = gGfxPixAnimationChar06, .frameData = gGfxSeqAnimationChar06, .spriteCount = 38, - .unusedA = 0x0, + .unkA = 0x0, }, [PERSON_ANIM_WINSTON_PAYNE] = { .gfxData = gGfxPixAnimationChar10, .frameData = gGfxSeqAnimationChar10, .spriteCount = 23, - .unusedA = 0x0, + .unkA = 0x0, }, [PERSON_ANIM_DUMMY11] = DUMMYPERSON, [PERSON_ANIM_MARVIN_GROSSBERG] = { .gfxData = gGfxPixAnimationChar14, .frameData = gGfxSeqAnimationChar14, .spriteCount = 33, - .unusedA = 0x0, + .unkA = 0x0, }, [PERSON_ANIM_DUMMY13] = DUMMYPERSON, [PERSON_ANIM_DUMMY14] = DUMMYPERSON, @@ -75,110 +75,110 @@ const struct PersonAnimationData gPersonAnimData[] = { .gfxData = gGfxPixAnimationChar16, .frameData = gGfxSeqAnimationChar16, .spriteCount = 14, - .unusedA = 0x0, + .unkA = 0x0, }, [PERSON_ANIM_WENDY_OLDBAG] = { .gfxData = gGfxPixAnimationChar15, .frameData = gGfxSeqAnimationChar15, .spriteCount = 29, - .unusedA = 0x0, + .unkA = 0x0, }, [PERSON_ANIM_SAL_MANELLA] = { .gfxData = gGfxPixAnimationChar18, .frameData = gGfxSeqAnimationChar18, .spriteCount = 39, - .unusedA = 0x0, + .unkA = 0x0, }, [PERSON_ANIM_DUMMY19] = DUMMYPERSON, [PERSON_ANIM_GUMSHOE] = { .gfxData = gGfxPixAnimationChar07, .frameData = gGfxSeqAnimationChar07, .spriteCount = 39, - .unusedA = 0x0, + .unkA = 0x0, }, [PERSON_ANIM_REDD_WHITE] = { .gfxData = gGfxPixAnimationChar08, .frameData = gGfxSeqAnimationChar08, .spriteCount = 36, - .unusedA = 0x0, + .unkA = 0x0, }, [PERSON_ANIM_APRIL_MAY] = { .gfxData = gGfxPixAnimationChar09, .frameData = gGfxSeqAnimationChar09, .spriteCount = 30, - .unusedA = 0x0, + .unkA = 0x0, }, [PERSON_ANIM_BELLBOY] = { .gfxData = gGfxPixAnimationChar11, .frameData = gGfxSeqAnimationChar11, .spriteCount = 35, - .unusedA = 0x0, + .unkA = 0x0, }, [PERSON_ANIM_DEE_VASQUEZ] = { .gfxData = gGfxPixAnimationChar19, .frameData = gGfxSeqAnimationChar19, .spriteCount = 29, - .unusedA = 0x0, + .unkA = 0x0, }, [PERSON_ANIM_LARRY_BUTZ] = { .gfxData = gGfxPixAnimationChar12, .frameData = gGfxSeqAnimationChar12, .spriteCount = 39, - .unusedA = 0x0, + .unkA = 0x0, }, [PERSON_ANIM_FRANK_SAWHIT] = { .gfxData = gGfxPixAnimationChar13, .frameData = gGfxSeqAnimationChar13, .spriteCount = 38, - .unusedA = 0x0, + .unkA = 0x0, }, [PERSON_ANIM_WILL_POWERS] = { .gfxData = gGfxPixAnimationChar17, .frameData = gGfxSeqAnimationChar17, .spriteCount = 39, - .unusedA = 0x0, + .unkA = 0x0, }, [PERSON_ANIM_CODY_HACKINS] = { .gfxData = gGfxPixAnimationChar20, .frameData = gGfxSeqAnimationChar20, .spriteCount = 18, - .unusedA = 0x0, + .unkA = 0x0, }, [PERSON_ANIM_BUSTUP_PHOENIX] = { .gfxData = gGfxPixAnimationChar21, .frameData = gGfxSeqAnimationChar21, .spriteCount = 7, - .unusedA = 0x0, + .unkA = 0x0, }, [PERSON_ANIM_BUSTUP_EDGEWORTH] = { .gfxData = gGfxPixAnimationChar22, .frameData = gGfxSeqAnimationChar22, .spriteCount = 10, - .unusedA = 0x0, + .unkA = 0x0, }, [PERSON_ANIM_LOTTA_HART] = { .gfxData = gGfxPixAnimationChar23, .frameData = gGfxSeqAnimationChar23, .spriteCount = 24, - .unusedA = 0x0, + .unkA = 0x0, }, [PERSON_ANIM_YANNI_YOGI] = { .gfxData = gGfxPixAnimationChar24, .frameData = gGfxSeqAnimationChar24, .spriteCount = 29, - .unusedA = 0x0, + .unkA = 0x0, }, [PERSON_ANIM_MANFRED_VONKARMA] = { .gfxData = gGfxPixAnimationChar25, .frameData = gGfxSeqAnimationChar25, .spriteCount = 36, - .unusedA = 0x0, + .unkA = 0x0, }, [PERSON_ANIM_POLLY] = { .gfxData = gGfxPixAnimationChar26, .frameData = gGfxSeqAnimationChar26, .spriteCount = 10, - .unusedA = 0x0, + .unkA = 0x0, }, }; diff --git a/src/bg.c b/src/bg.c index 5305b0c..e477321 100644 --- a/src/bg.c +++ b/src/bg.c @@ -220,7 +220,7 @@ void SetTextboxSize(u32 unk0) SetTextboxNametag(scriptCtx->textboxNameId & 0x7F, (u8)(scriptCtx->textboxNameId & 0x80)); break; case 1: - scriptCtx->unused3A = 0; + scriptCtx->unk3A = 0; scriptCtx->textboxYPos = 14; scriptCtx->textboxState = 2; SetTextboxNametag(0, FALSE); @@ -259,10 +259,10 @@ void UpdateTextbox() case 1: break; case 2: - scriptCtx->unused3A += 2; - if(scriptCtx->unused3A < 2) + scriptCtx->unk3A += 2; + if(scriptCtx->unk3A < 2) break; - scriptCtx->unused3A = 0; + scriptCtx->unk3A = 0; tiley = scriptCtx->textboxYPos * 32; for(i = 0; i < 32; i++) { diff --git a/src/court.c b/src/court.c index 3a6192d..0ba2d14 100644 --- a/src/court.c +++ b/src/court.c @@ -764,11 +764,11 @@ void VerdictProcess(struct Main * main) } } -void UpdateQuestioningMenuSprites(struct Main * main, struct TestimonyStruct * testimony, u32 clearButtonOAMs) // questioning_menu_disp +void UpdateQuestioningMenuSprites(struct Main * main, struct TestimonyStruct * testimony, u32 unk2) // questioning_menu_disp { u32 i; struct OamAttrs * oam; - if(gScriptContext.holdItSection == 0 || clearButtonOAMs == 0) + if(gScriptContext.holdItSection == 0 || unk2 == 0) { oam = &gOamObjects[53]; oam->attr0 = SPRITE_ATTR0_CLEAR; diff --git a/src/court_record.c b/src/court_record.c index 68d7c4f..28eabb6 100644 --- a/src/court_record.c +++ b/src/court_record.c @@ -1187,7 +1187,7 @@ void CourtRecordDetailSubMenu(struct Main * main, struct CourtRecord * courtReco main->Bg256_scroll_y = gSaveDataBuffer.main.Bg256_scroll_y; main->Bg256_pos_x = gSaveDataBuffer.main.Bg256_pos_x; main->Bg256_pos_y = gSaveDataBuffer.main.Bg256_pos_y; - main->unused38 = gSaveDataBuffer.main.unused38; + main->unk38 = gSaveDataBuffer.main.unk38; main->Bg256_dir = gSaveDataBuffer.main.Bg256_dir; main->horizontolBGScrollSpeed = gSaveDataBuffer.main.horizontolBGScrollSpeed; main->verticalBGScrollSpeed = gSaveDataBuffer.main.verticalBGScrollSpeed; diff --git a/src/investigation_segment_1_0.c b/src/investigation_segment_1_0.c index ba90354..516cba6 100644 --- a/src/investigation_segment_1_0.c +++ b/src/investigation_segment_1_0.c @@ -476,7 +476,7 @@ const struct TalkData gTalkData_1_0[14] = { { .roomId = 0x0, .personId = PERSON_ANIM_MAYA, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x1, 0x2, 0xFF, 0xFF }, .talkFlagId = { 0x1, 0x2, 0xFF, 0xFF }, @@ -485,7 +485,7 @@ const struct TalkData gTalkData_1_0[14] = { { .roomId = 0x0, .personId = PERSON_ANIM_MAYA, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x1, 0x2, 0x0, 0xFF }, .talkFlagId = { 0x1, 0x2, 0x0, 0xFF }, @@ -494,7 +494,7 @@ const struct TalkData gTalkData_1_0[14] = { { .roomId = 0x2, .personId = PERSON_ANIM_MAYA, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x4, 0x6, 0xFF, 0xFF }, .talkFlagId = { 0x4, 0x3, 0xFF, 0xFF }, @@ -503,7 +503,7 @@ const struct TalkData gTalkData_1_0[14] = { { .roomId = 0x2, .personId = PERSON_ANIM_MAYA, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x4, 0x6, 0x8, 0xFF }, .talkFlagId = { 0x4, 0x3, 0x5, 0xFF }, @@ -512,7 +512,7 @@ const struct TalkData gTalkData_1_0[14] = { { .roomId = 0x2, .personId = PERSON_ANIM_MAYA, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x4, 0x6, 0x7, 0xFF }, .talkFlagId = { 0x4, 0x3, 0x6, 0xFF }, @@ -521,7 +521,7 @@ const struct TalkData gTalkData_1_0[14] = { { .roomId = 0x2, .personId = PERSON_ANIM_MAYA, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x4, 0x6, 0x8, 0x7 }, .talkFlagId = { 0x4, 0x3, 0x5, 0x6 }, @@ -530,7 +530,7 @@ const struct TalkData gTalkData_1_0[14] = { { .roomId = 0x0, .personId = PERSON_ANIM_GUMSHOE, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x3, 0x4, 0xFF, 0xFF }, .talkFlagId = { 0x7, 0x8, 0xFF, 0xFF }, @@ -539,7 +539,7 @@ const struct TalkData gTalkData_1_0[14] = { { .roomId = 0x0, .personId = PERSON_ANIM_GUMSHOE, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x3, 0x4, 0x5, 0xFF }, .talkFlagId = { 0x7, 0x8, 0x9, 0xFF }, @@ -548,7 +548,7 @@ const struct TalkData gTalkData_1_0[14] = { { .roomId = 0x5, .personId = PERSON_ANIM_APRIL_MAY, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0xC, 0xD, 0xE, 0xFF }, .talkFlagId = { 0xA, 0xB, 0xC, 0xFF }, @@ -557,7 +557,7 @@ const struct TalkData gTalkData_1_0[14] = { { .roomId = 0x2, .personId = PERSON_ANIM_MAYA, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x6, 0x9, 0xFF, 0xFF }, .talkFlagId = { 0x3, 0xD, 0xFF, 0xFF }, @@ -566,7 +566,7 @@ const struct TalkData gTalkData_1_0[14] = { { .roomId = 0x2, .personId = PERSON_ANIM_MAYA, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x6, 0x9, 0xA, 0xFF }, .talkFlagId = { 0x3, 0xD, 0xE, 0xFF }, @@ -575,7 +575,7 @@ const struct TalkData gTalkData_1_0[14] = { { .roomId = 0x2, .personId = PERSON_ANIM_MAYA, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x6, 0x9, 0xA, 0xB }, .talkFlagId = { 0x3, 0xD, 0xE, 0xF }, @@ -584,7 +584,7 @@ const struct TalkData gTalkData_1_0[14] = { { .roomId = 0x3, .personId = PERSON_ANIM_MARVIN_GROSSBERG, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0xF, 0x3, 0x10, 0xFF }, .talkFlagId = { 0x10, 0x11, 0x12, 0xFF }, @@ -593,7 +593,7 @@ const struct TalkData gTalkData_1_0[14] = { { .roomId = 0xFF, .personId = 0xFF, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0xFF, .iconId = { 0xFF, 0xFF, 0xFF, 0xFF }, .talkFlagId = { 0xFF, 0xFF, 0xFF, 0xFF }, diff --git a/src/investigation_segment_1_2.c b/src/investigation_segment_1_2.c index a09a8e2..cd9ae97 100644 --- a/src/investigation_segment_1_2.c +++ b/src/investigation_segment_1_2.c @@ -114,7 +114,7 @@ const struct TalkData gTalkData_1_2[13] = { { .roomId = 0x2, .personId = PERSON_ANIM_APRIL_MAY, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x11, 0x12, 0x13, 0xFF }, .talkFlagId = { 0x13, 0x15, 0x14, 0xFF }, @@ -123,7 +123,7 @@ const struct TalkData gTalkData_1_2[13] = { { .roomId = 0x2, .personId = PERSON_ANIM_APRIL_MAY, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x11, 0x12, 0x13, 0xFF }, .talkFlagId = { 0x16, 0x15, 0x14, 0xFF }, @@ -132,7 +132,7 @@ const struct TalkData gTalkData_1_2[13] = { { .roomId = 0x2, .personId = PERSON_ANIM_APRIL_MAY, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x12, 0x13, 0xFF, 0xFF }, .talkFlagId = { 0x15, 0x14, 0xFF, 0xFF }, @@ -141,7 +141,7 @@ const struct TalkData gTalkData_1_2[13] = { { .roomId = 0x3, .personId = PERSON_ANIM_MARVIN_GROSSBERG, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x14, 0x15, 0x16, 0xFF }, .talkFlagId = { 0x18, 0x19, 0x1A, 0xFF }, @@ -150,7 +150,7 @@ const struct TalkData gTalkData_1_2[13] = { { .roomId = 0x3, .personId = PERSON_ANIM_MARVIN_GROSSBERG, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x14, 0x15, 0x16, 0xFF }, .talkFlagId = { 0x18, 0x19, 0x1A, 0xFF }, @@ -159,7 +159,7 @@ const struct TalkData gTalkData_1_2[13] = { { .roomId = 0x3, .personId = PERSON_ANIM_MARVIN_GROSSBERG, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x14, 0x15, 0x17, 0xFF }, .talkFlagId = { 0x1E, 0x1F, 0x20, 0xFF }, @@ -168,7 +168,7 @@ const struct TalkData gTalkData_1_2[13] = { { .roomId = 0x3, .personId = PERSON_ANIM_MARVIN_GROSSBERG, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x14, 0x15, 0x18, 0x19 }, .talkFlagId = { 0x1E, 0x1F, 0x21, 0x22 }, @@ -177,7 +177,7 @@ const struct TalkData gTalkData_1_2[13] = { { .roomId = 0x4, .personId = PERSON_ANIM_REDD_WHITE, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x1A, 0x1D, 0x1E, 0xFF }, .talkFlagId = { 0x26, 0x27, 0x28, 0xFF }, @@ -186,7 +186,7 @@ const struct TalkData gTalkData_1_2[13] = { { .roomId = 0x4, .personId = PERSON_ANIM_REDD_WHITE, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x1A, 0x1D, 0x1E, 0x16 }, .talkFlagId = { 0x26, 0x27, 0x28, 0x29 }, @@ -195,7 +195,7 @@ const struct TalkData gTalkData_1_2[13] = { { .roomId = 0x4, .personId = PERSON_ANIM_REDD_WHITE, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x1A, 0x1D, 0x1E, 0x16 }, .talkFlagId = { 0x26, 0x27, 0x28, 0x29 }, @@ -204,7 +204,7 @@ const struct TalkData gTalkData_1_2[13] = { { .roomId = 0x4, .personId = PERSON_ANIM_REDD_WHITE, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x1A, 0x1D, 0x1F, 0xFF }, .talkFlagId = { 0x2E, 0x2F, 0x30, 0xFF }, @@ -213,7 +213,7 @@ const struct TalkData gTalkData_1_2[13] = { { .roomId = 0x5, .personId = PERSON_ANIM_BELLBOY, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x1A, 0x1B, 0x1C, 0xFF }, .talkFlagId = { 0x23, 0x24, 0x25, 0xFF }, @@ -222,7 +222,7 @@ const struct TalkData gTalkData_1_2[13] = { { .roomId = 0xFF, .personId = 0xFF, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0xFF, .iconId = { 0xFF, 0xFF, 0xFF, 0xFF }, .talkFlagId = { 0xFF, 0xFF, 0xFF, 0xFF }, diff --git a/src/investigation_segment_2_0.c b/src/investigation_segment_2_0.c index 88d048b..079e0de 100644 --- a/src/investigation_segment_2_0.c +++ b/src/investigation_segment_2_0.c @@ -358,7 +358,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0x6, .personId = PERSON_ANIM_MAYA, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x20, 0x21, 0xFF, 0xFF }, .talkFlagId = { 0x31, 0x32, 0xFF, 0xFF }, @@ -367,7 +367,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0x6, .personId = PERSON_ANIM_MAYA, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x20, 0x22, 0xFF, 0xFF }, .talkFlagId = { 0x33, 0x34, 0xFF, 0xFF }, @@ -376,7 +376,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0x2, .personId = PERSON_ANIM_WILL_POWERS, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x23, 0x24, 0xFF, 0xFF }, .talkFlagId = { 0x35, 0x36, 0xFF, 0xFF }, @@ -385,7 +385,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0x2, .personId = PERSON_ANIM_WILL_POWERS, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x23, 0x24, 0x25, 0xFF }, .talkFlagId = { 0x35, 0x36, 0x37, 0xFF }, @@ -394,7 +394,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0x2, .personId = PERSON_ANIM_WILL_POWERS, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x26, 0x27, 0x24, 0xFF }, .talkFlagId = { 0x38, 0x39, 0x36, 0xFF }, @@ -403,7 +403,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0x7, .personId = PERSON_ANIM_WENDY_OLDBAG, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x28, 0x29, 0xFF, 0xFF }, .talkFlagId = { 0x3A, 0x3B, 0xFF, 0xFF }, @@ -412,7 +412,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0x7, .personId = PERSON_ANIM_WENDY_OLDBAG, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x28, 0x29, 0x2A, 0xFF }, .talkFlagId = { 0x3A, 0x3B, 0x3C, 0xFF }, @@ -421,7 +421,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0x7, .personId = PERSON_ANIM_WENDY_OLDBAG, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x28, 0x29, 0x2B, 0xFF }, .talkFlagId = { 0x3A, 0x3B, 0x3D, 0xFF }, @@ -430,7 +430,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0x7, .personId = PERSON_ANIM_WENDY_OLDBAG, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x28, 0x29, 0x2A, 0x2B }, .talkFlagId = { 0x3A, 0x3B, 0x3C, 0x3D }, @@ -439,7 +439,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0x7, .personId = PERSON_ANIM_WENDY_OLDBAG, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x2C, 0x2B, 0x2A, 0xFF }, .talkFlagId = { 0x3E, 0x3F, 0x40, 0xFF }, @@ -448,7 +448,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0x7, .personId = PERSON_ANIM_WENDY_OLDBAG, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x2C, 0x2B, 0x2A, 0x2D }, .talkFlagId = { 0x3E, 0x3F, 0x40, 0x41 }, @@ -457,7 +457,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0x7, .personId = PERSON_ANIM_WENDY_OLDBAG, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x2C, 0x2B, 0x2D, 0x2E }, .talkFlagId = { 0x3E, 0x3F, 0x41, 0x42 }, @@ -466,7 +466,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0xA, .personId = PERSON_ANIM_GUMSHOE, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x2F, 0x30, 0x27, 0xFF }, .talkFlagId = { 0x43, 0x44, 0x45, 0xFF }, @@ -475,7 +475,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0xA, .personId = PERSON_ANIM_GUMSHOE, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x2F, 0x30, 0x27, 0x31 }, .talkFlagId = { 0x43, 0x44, 0x45, 0x46 }, @@ -484,7 +484,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0xB, .personId = PERSON_ANIM_PENNY_NICHOLS, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x32, 0x29, 0xFF, 0xFF }, .talkFlagId = { 0x47, 0x48, 0xFF, 0xFF }, @@ -493,7 +493,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0xB, .personId = PERSON_ANIM_PENNY_NICHOLS, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x32, 0x29, 0x33, 0xFF }, .talkFlagId = { 0x47, 0x48, 0x49, 0xFF }, @@ -502,7 +502,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0xFF, .personId = 0xFF, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0xFF, .iconId = { 0xFF, 0xFF, 0xFF, 0xFF }, .talkFlagId = { 0xFF, 0xFF, 0xFF, 0xFF }, diff --git a/src/investigation_segment_2_2.c b/src/investigation_segment_2_2.c index b801e3d..ca050c1 100644 --- a/src/investigation_segment_2_2.c +++ b/src/investigation_segment_2_2.c @@ -306,7 +306,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0x6, .personId = PERSON_ANIM_MAYA, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x20, 0x21, 0xFF, 0xFF }, .talkFlagId = { 0x4A, 0x4B, 0xFF, 0xFF }, @@ -315,7 +315,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0x6, .personId = PERSON_ANIM_SUMMONED_MIA, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x20, 0x21, 0xFF, 0xFF }, .talkFlagId = { 0x4C, 0x4D, 0xFF, 0xFF }, @@ -324,7 +324,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0x2, .personId = PERSON_ANIM_WILL_POWERS, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x34, 0x35, 0xFF, 0xFF }, .talkFlagId = { 0x4E, 0x4F, 0xFF, 0xFF }, @@ -333,7 +333,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0x7, .personId = PERSON_ANIM_PENNY_NICHOLS, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x28, 0x34, 0x36, 0xFF }, .talkFlagId = { 0x50, 0x51, 0x52, 0xFF }, @@ -342,7 +342,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0x7, .personId = PERSON_ANIM_WENDY_OLDBAG, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x34, 0x36, 0xFF, 0xFF }, .talkFlagId = { 0x53, 0x54, 0xFF, 0xFF }, @@ -351,7 +351,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0x7, .personId = PERSON_ANIM_WENDY_OLDBAG, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x34, 0x36, 0x46, 0xFF }, .talkFlagId = { 0x55, 0x56, 0x57, 0xFF }, @@ -360,7 +360,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0x8, .personId = PERSON_ANIM_CODY_HACKINS, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x37, 0x24, 0xFF, 0xFF }, .talkFlagId = { 0x58, 0x59, 0xFF, 0xFF }, @@ -369,7 +369,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0x8, .personId = PERSON_ANIM_CODY_HACKINS, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x24, 0x23, 0xFF, 0xFF }, .talkFlagId = { 0x59, 0x5A, 0xFF, 0xFF }, @@ -378,7 +378,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0x9, .personId = PERSON_ANIM_SAL_MANELLA, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x32, 0xFF, 0xFF, 0xFF }, .talkFlagId = { 0x5B, 0xFF, 0xFF, 0xFF }, @@ -387,7 +387,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0x9, .personId = PERSON_ANIM_SAL_MANELLA, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x32, 0x38, 0x39, 0xFF }, .talkFlagId = { 0x5B, 0x5C, 0x5D, 0xFF }, @@ -396,7 +396,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0x9, .personId = PERSON_ANIM_CODY_HACKINS, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x24, 0x23, 0xFF, 0xFF }, .talkFlagId = { 0x5E, 0x5F, 0xFF, 0xFF }, @@ -405,7 +405,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0x9, .personId = PERSON_ANIM_CODY_HACKINS, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x24, 0x23, 0xFF, 0xFF }, .talkFlagId = { 0x60, 0x62, 0xFF, 0xFF }, @@ -414,7 +414,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0x9, .personId = PERSON_ANIM_CODY_HACKINS, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x24, 0x23, 0x3A, 0xFF }, .talkFlagId = { 0x60, 0x62, 0x61, 0xFF }, @@ -423,7 +423,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0xD, .personId = PERSON_ANIM_DEE_VASQUEZ, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x32, 0x24, 0x35, 0xFF }, .talkFlagId = { 0x63, 0x64, 0x65, 0xFF }, @@ -432,7 +432,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0xD, .personId = PERSON_ANIM_DEE_VASQUEZ, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x32, 0x24, 0x35, 0x3B }, .talkFlagId = { 0x63, 0x64, 0x65, 0x66 }, @@ -441,7 +441,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0xD, .personId = PERSON_ANIM_PENNY_NICHOLS, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x34, 0x3C, 0xFF, 0xFF }, .talkFlagId = { 0x67, 0x68, 0xFF, 0xFF }, @@ -450,7 +450,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0xD, .personId = PERSON_ANIM_PENNY_NICHOLS, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x34, 0x3C, 0x47, 0xFF }, .talkFlagId = { 0x67, 0x68, 0x69, 0xFF }, @@ -459,7 +459,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0xFF, .personId = 0xFF, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0xFF, .iconId = { 0xFF, 0xFF, 0xFF, 0xFF }, .talkFlagId = { 0xFF, 0xFF, 0xFF, 0xFF }, diff --git a/src/investigation_segment_2_4.c b/src/investigation_segment_2_4.c index adf7fbc..536edae 100644 --- a/src/investigation_segment_2_4.c +++ b/src/investigation_segment_2_4.c @@ -193,7 +193,7 @@ const struct TalkData gTalkData_2_4[13] = { { .roomId = 0x6, .personId = PERSON_ANIM_MAYA, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x24, 0x3D, 0x21, 0xFF }, .talkFlagId = { 0x6A, 0x6B, 0x6C, 0xFF }, @@ -202,7 +202,7 @@ const struct TalkData gTalkData_2_4[13] = { { .roomId = 0x2, .personId = PERSON_ANIM_WILL_POWERS, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x3E, 0x3F, 0x3C, 0xFF }, .talkFlagId = { 0x6D, 0x6E, 0x6F, 0xFF }, @@ -211,7 +211,7 @@ const struct TalkData gTalkData_2_4[13] = { { .roomId = 0x7, .personId = PERSON_ANIM_WENDY_OLDBAG, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x3E, 0x3F, 0x3C, 0xFF }, .talkFlagId = { 0x70, 0x71, 0x72, 0xFF }, @@ -220,7 +220,7 @@ const struct TalkData gTalkData_2_4[13] = { { .roomId = 0x7, .personId = PERSON_ANIM_WENDY_OLDBAG, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x3E, 0x3F, 0x3C, 0x40 }, .talkFlagId = { 0x70, 0x71, 0x72, 0x7E }, @@ -229,7 +229,7 @@ const struct TalkData gTalkData_2_4[13] = { { .roomId = 0x8, .personId = PERSON_ANIM_GUMSHOE, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x41, 0x42, 0x43, 0xFF }, .talkFlagId = { 0x73, 0x74, 0x75, 0xFF }, @@ -238,7 +238,7 @@ const struct TalkData gTalkData_2_4[13] = { { .roomId = 0x8, .personId = PERSON_ANIM_GUMSHOE, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x42, 0x43, 0xFF, 0xFF }, .talkFlagId = { 0x74, 0x75, 0xFF, 0xFF }, @@ -247,7 +247,7 @@ const struct TalkData gTalkData_2_4[13] = { { .roomId = 0x9, .personId = PERSON_ANIM_PENNY_NICHOLS, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x3C, 0x44, 0xFF, 0xFF }, .talkFlagId = { 0x76, 0x78, 0xFF, 0xFF }, @@ -256,7 +256,7 @@ const struct TalkData gTalkData_2_4[13] = { { .roomId = 0x9, .personId = PERSON_ANIM_PENNY_NICHOLS, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x3C, 0x44, 0x45, 0xFF }, .talkFlagId = { 0x76, 0x78, 0x79, 0xFF }, @@ -265,7 +265,7 @@ const struct TalkData gTalkData_2_4[13] = { { .roomId = 0x9, .personId = PERSON_ANIM_PENNY_NICHOLS, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x3C, 0x44, 0x40, 0xFF }, .talkFlagId = { 0x76, 0x78, 0x7A, 0xFF }, @@ -274,7 +274,7 @@ const struct TalkData gTalkData_2_4[13] = { { .roomId = 0x9, .personId = PERSON_ANIM_PENNY_NICHOLS, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x3C, 0x44, 0x45, 0x40 }, .talkFlagId = { 0x76, 0x78, 0x79, 0x7A }, @@ -283,7 +283,7 @@ const struct TalkData gTalkData_2_4[13] = { { .roomId = 0x9, .personId = PERSON_ANIM_PENNY_NICHOLS, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x3C, 0x44, 0x45, 0x40 }, .talkFlagId = { 0x76, 0x78, 0x79, 0x77 }, @@ -292,7 +292,7 @@ const struct TalkData gTalkData_2_4[13] = { { .roomId = 0xC, .personId = PERSON_ANIM_DEE_VASQUEZ, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x3C, 0x29, 0x3F, 0xFF }, .talkFlagId = { 0x7B, 0x7C, 0x7D, 0xFF }, @@ -301,7 +301,7 @@ const struct TalkData gTalkData_2_4[13] = { { .roomId = 0xFF, .personId = 0xFF, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0xFF, .iconId = { 0xFF, 0xFF, 0xFF, 0xFF }, .talkFlagId = { 0xFF, 0xFF, 0xFF, 0xFF }, diff --git a/src/investigation_segment_3_0.c b/src/investigation_segment_3_0.c index 0aeb51d..6709a38 100644 --- a/src/investigation_segment_3_0.c +++ b/src/investigation_segment_3_0.c @@ -484,7 +484,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x6, .personId = PERSON_ANIM_MAYA, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x48, 0x49, 0xFF, 0xFF }, .talkFlagId = { 0x7F, 0x80, 0xFF, 0xFF }, @@ -493,7 +493,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x6, .personId = PERSON_ANIM_MAYA, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x48, 0x49, 0xFF, 0xFF }, .talkFlagId = { 0x81, 0x82, 0xFF, 0xFF }, @@ -502,7 +502,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x2, .personId = PERSON_ANIM_EDGEWORTH, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x4A, 0x4B, 0xFF, 0xFF }, .talkFlagId = { 0x83, 0x84, 0xFF, 0xFF }, @@ -511,7 +511,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x2, .personId = PERSON_ANIM_EDGEWORTH, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x4A, 0x4B, 0x4C, 0xFF }, .talkFlagId = { 0x83, 0x84, 0x85, 0xFF }, @@ -520,7 +520,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x2, .personId = PERSON_ANIM_EDGEWORTH, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x4A, 0x4B, 0xFF, 0xFF }, .talkFlagId = { 0x86, 0x87, 0xFF, 0xFF }, @@ -529,7 +529,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x2, .personId = PERSON_ANIM_EDGEWORTH, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x4D, 0xFF, 0xFF, 0xFF }, .talkFlagId = { 0x88, 0xFF, 0xFF, 0xFF }, @@ -538,7 +538,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x2, .personId = PERSON_ANIM_EDGEWORTH, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x4D, 0x4E, 0x4F, 0xFF }, .talkFlagId = { 0x88, 0x89, 0x8A, 0xFF }, @@ -547,7 +547,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x10, .personId = PERSON_ANIM_GUMSHOE, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x4A, 0x50, 0x51, 0xFF }, .talkFlagId = { 0x8B, 0x8C, 0x8D, 0xFF }, @@ -556,7 +556,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x10, .personId = PERSON_ANIM_GUMSHOE, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x4A, 0x50, 0x51, 0x52 }, .talkFlagId = { 0x8B, 0x8C, 0x8D, 0x8E }, @@ -565,7 +565,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x11, .personId = PERSON_ANIM_LARRY_BUTZ, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x4A, 0x53, 0xFF, 0xFF }, .talkFlagId = { 0x8F, 0x90, 0xFF, 0xFF }, @@ -574,7 +574,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x11, .personId = PERSON_ANIM_LARRY_BUTZ, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x4A, 0x53, 0x50, 0xFF }, .talkFlagId = { 0x8F, 0x90, 0x91, 0xFF }, @@ -583,7 +583,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x11, .personId = PERSON_ANIM_LARRY_BUTZ, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x4A, 0x53, 0x54, 0xFF }, .talkFlagId = { 0x8F, 0x90, 0x92, 0xFF }, @@ -592,7 +592,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x11, .personId = PERSON_ANIM_LARRY_BUTZ, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x4A, 0x53, 0x50, 0x54 }, .talkFlagId = { 0x8F, 0x90, 0x91, 0x92 }, @@ -601,7 +601,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x12, .personId = PERSON_ANIM_LOTTA_HART, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x4A, 0x55, 0xFF, 0xFF }, .talkFlagId = { 0x93, 0x94, 0xFF, 0xFF }, @@ -610,7 +610,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x12, .personId = PERSON_ANIM_LOTTA_HART, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x4A, 0x56, 0xFF, 0xFF }, .talkFlagId = { 0x95, 0x97, 0xFF, 0xFF }, @@ -619,7 +619,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x12, .personId = PERSON_ANIM_LOTTA_HART, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x4A, 0x56, 0x57, 0xFF }, .talkFlagId = { 0x95, 0x97, 0x96, 0xFF }, @@ -628,7 +628,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0xE, .personId = PERSON_ANIM_GUMSHOE, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x58, 0x59, 0xFF, 0xFF }, .talkFlagId = { 0x98, 0x99, 0xFF, 0xFF }, @@ -637,7 +637,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0xE, .personId = PERSON_ANIM_GUMSHOE, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x58, 0x59, 0x5A, 0xFF }, .talkFlagId = { 0x98, 0x99, 0x9A, 0xFF }, @@ -646,7 +646,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0xE, .personId = PERSON_ANIM_GUMSHOE, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x58, 0x59, 0x5A, 0x5B }, .talkFlagId = { 0x98, 0x99, 0x9A, 0x9B }, @@ -655,7 +655,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0xE, .personId = PERSON_ANIM_GUMSHOE, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x5C, 0x5D, 0x50, 0xFF }, .talkFlagId = { 0xA0, 0xA1, 0xA2, 0xFF }, @@ -664,7 +664,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x3, .personId = PERSON_ANIM_MARVIN_GROSSBERG, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x4A, 0x5E, 0xFF, 0xFF }, .talkFlagId = { 0x9C, 0x9D, 0xFF, 0xFF }, @@ -673,7 +673,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x3, .personId = PERSON_ANIM_MARVIN_GROSSBERG, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x4A, 0x5E, 0x5F, 0xFF }, .talkFlagId = { 0x9C, 0x9D, 0x9E, 0xFF }, @@ -682,7 +682,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x3, .personId = PERSON_ANIM_MARVIN_GROSSBERG, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x4A, 0x5E, 0x5F, 0x4D }, .talkFlagId = { 0x9C, 0x9D, 0x9E, 0x9F }, @@ -691,7 +691,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0xFF, .personId = 0xFF, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0xFF, .iconId = { 0xFF, 0xFF, 0xFF, 0xFF }, .talkFlagId = { 0xFF, 0xFF, 0xFF, 0xFF }, diff --git a/src/investigation_segment_3_2.c b/src/investigation_segment_3_2.c index fb92270..bb5eddb 100644 --- a/src/investigation_segment_3_2.c +++ b/src/investigation_segment_3_2.c @@ -377,7 +377,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0x6, .personId = PERSON_ANIM_MAYA, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x48, 0x49, 0xFF, 0xFF }, .talkFlagId = { 0xA5, 0xA6, 0xFF, 0xFF }, @@ -386,7 +386,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0x2, .personId = PERSON_ANIM_MAYA, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x61, 0x62, 0xFF, 0xFF }, .talkFlagId = { 0xA3, 0xA4, 0xFF, 0xFF }, @@ -395,7 +395,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0x2, .personId = PERSON_ANIM_MAYA, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x48, 0x49, 0xFF, 0xFF }, .talkFlagId = { 0xA7, 0xA8, 0xFF, 0xFF }, @@ -404,7 +404,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0x10, .personId = PERSON_ANIM_LOTTA_HART, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x63, 0x54, 0x64, 0xFF }, .talkFlagId = { 0xA9, 0xAA, 0xAB, 0xFF }, @@ -413,7 +413,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0x11, .personId = PERSON_ANIM_LARRY_BUTZ, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x50, 0x65, 0xFF, 0xFF }, .talkFlagId = { 0xAC, 0xAD, 0xFF, 0xFF }, @@ -422,7 +422,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0x11, .personId = PERSON_ANIM_LARRY_BUTZ, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x50, 0x65, 0x66, 0xFF }, .talkFlagId = { 0xAC, 0xAD, 0xAE, 0xFF }, @@ -431,7 +431,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0x12, .personId = PERSON_ANIM_GUMSHOE, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x5D, 0x67, 0x68, 0xFF }, .talkFlagId = { 0xAF, 0xB0, 0xB1, 0xFF }, @@ -440,7 +440,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0x12, .personId = PERSON_ANIM_LOTTA_HART, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x4A, 0x54, 0xFF, 0xFF }, .talkFlagId = { 0xB3, 0xB2, 0xFF, 0xFF }, @@ -449,7 +449,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0x12, .personId = PERSON_ANIM_LOTTA_HART, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x4A, 0x69, 0xFF, 0xFF }, .talkFlagId = { 0xB3, 0xB4, 0xFF, 0xFF }, @@ -458,7 +458,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0x14, .personId = PERSON_ANIM_YANNI_YOGI, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x6D, 0x6E, 0xFF, 0xFF }, .talkFlagId = { 0xB5, 0xB6, 0xFF, 0xFF }, @@ -467,7 +467,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0x14, .personId = PERSON_ANIM_YANNI_YOGI, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x6D, 0x6E, 0x6F, 0xFF }, .talkFlagId = { 0xB5, 0xB6, 0xB7, 0xFF }, @@ -476,7 +476,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0x14, .personId = PERSON_ANIM_YANNI_YOGI, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x6D, 0x6E, 0x70, 0xFF }, .talkFlagId = { 0xB5, 0xB6, 0xB8, 0xFF }, @@ -485,7 +485,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0x14, .personId = PERSON_ANIM_YANNI_YOGI, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x6D, 0x6E, 0x6F, 0x70 }, .talkFlagId = { 0xB5, 0xB6, 0xB7, 0xB8 }, @@ -494,7 +494,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0xE, .personId = PERSON_ANIM_GUMSHOE, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x6A, 0x54, 0xFF, 0xFF }, .talkFlagId = { 0xB9, 0xBA, 0xFF, 0xFF }, @@ -503,7 +503,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0xE, .personId = PERSON_ANIM_GUMSHOE, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x6A, 0x6B, 0xFF, 0xFF }, .talkFlagId = { 0xB9, 0xBB, 0xFF, 0xFF }, @@ -512,7 +512,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0xE, .personId = PERSON_ANIM_GUMSHOE, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x6C, 0x4D, 0xFF, 0xFF }, .talkFlagId = { 0xBC, 0xBD, 0xFF, 0xFF }, @@ -521,7 +521,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0xF, .personId = PERSON_ANIM_MAYA, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x71, 0x72, 0x73, 0xFF }, .talkFlagId = { 0xBE, 0xBF, 0xC0, 0xFF }, @@ -530,7 +530,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0xFF, .personId = 0xFF, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0xFF, .iconId = { 0xFF, 0xFF, 0xFF, 0xFF }, .talkFlagId = { 0xFF, 0xFF, 0xFF, 0xFF }, diff --git a/src/investigation_segment_3_4.c b/src/investigation_segment_3_4.c index bf791fc..e4cfe7a 100644 --- a/src/investigation_segment_3_4.c +++ b/src/investigation_segment_3_4.c @@ -122,7 +122,7 @@ const struct TalkData gTalkData_3_4[12] = { { .roomId = 0x6, .personId = PERSON_ANIM_LARRY_BUTZ, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x63, 0x50, 0xFF, 0xFF }, .talkFlagId = { 0xC1, 0xC2, 0xFF, 0xFF }, @@ -131,7 +131,7 @@ const struct TalkData gTalkData_3_4[12] = { { .roomId = 0x6, .personId = PERSON_ANIM_LARRY_BUTZ, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x63, 0x50, 0x74, 0xFF }, .talkFlagId = { 0xC1, 0xC2, 0xC3, 0xFF }, @@ -140,7 +140,7 @@ const struct TalkData gTalkData_3_4[12] = { { .roomId = 0x6, .personId = PERSON_ANIM_LARRY_BUTZ, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x63, 0x50, 0x74, 0x75 }, .talkFlagId = { 0xC1, 0xC2, 0xC3, 0xC4 }, @@ -149,7 +149,7 @@ const struct TalkData gTalkData_3_4[12] = { { .roomId = 0x6, .personId = PERSON_ANIM_MAYA, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x48, 0x49, 0xFF, 0xFF }, .talkFlagId = { 0xC5, 0xC6, 0xFF, 0xFF }, @@ -158,7 +158,7 @@ const struct TalkData gTalkData_3_4[12] = { { .roomId = 0x2, .personId = PERSON_ANIM_EDGEWORTH, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x76, 0x77, 0xFF, 0xFF }, .talkFlagId = { 0xC7, 0xC8, 0xFF, 0xFF }, @@ -167,7 +167,7 @@ const struct TalkData gTalkData_3_4[12] = { { .roomId = 0x2, .personId = PERSON_ANIM_EDGEWORTH, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x76, 0x77, 0x78, 0xFF }, .talkFlagId = { 0xC7, 0xC8, 0xC9, 0xFF }, @@ -176,7 +176,7 @@ const struct TalkData gTalkData_3_4[12] = { { .roomId = 0x2, .personId = PERSON_ANIM_EDGEWORTH, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x76, 0x77, 0x78, 0x79 }, .talkFlagId = { 0xC7, 0xC8, 0xC9, 0xCA }, @@ -185,7 +185,7 @@ const struct TalkData gTalkData_3_4[12] = { { .roomId = 0xF, .personId = PERSON_ANIM_MANFRED_VONKARMA, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x50, 0x5D, 0xFF, 0xFF }, .talkFlagId = { 0xCB, 0xCC, 0xFF, 0xFF }, @@ -194,7 +194,7 @@ const struct TalkData gTalkData_3_4[12] = { { .roomId = 0x3, .personId = PERSON_ANIM_MARVIN_GROSSBERG, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x7A, 0x7B, 0xFF, 0xFF }, .talkFlagId = { 0xCD, 0xCE, 0xFF, 0xFF }, @@ -203,7 +203,7 @@ const struct TalkData gTalkData_3_4[12] = { { .roomId = 0x3, .personId = PERSON_ANIM_MARVIN_GROSSBERG, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x7A, 0x7B, 0x77, 0xFF }, .talkFlagId = { 0xCD, 0xCE, 0xCF, 0xFF }, @@ -212,7 +212,7 @@ const struct TalkData gTalkData_3_4[12] = { { .roomId = 0x3, .personId = PERSON_ANIM_MARVIN_GROSSBERG, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x7A, 0x7B, 0x77, 0x7C }, .talkFlagId = { 0xCD, 0xCE, 0xCF, 0xD0 }, @@ -221,7 +221,7 @@ const struct TalkData gTalkData_3_4[12] = { { .roomId = 0xFF, .personId = 0xFF, - .unused2 = 0xFF, + .unk2 = 0xFF, .enableFlag = 0xFF, .iconId = { 0xFF, 0xFF, 0xFF, 0xFF }, .talkFlagId = { 0xFF, 0xFF, 0xFF, 0xFF }, diff --git a/src/save_processes.c b/src/save_processes.c index a21643a..3a97b97 100644 --- a/src/save_processes.c +++ b/src/save_processes.c @@ -428,7 +428,7 @@ void SaveGameExitSaveScreen(struct Main *main) main->Bg256_scroll_y = gSaveDataBuffer.main.Bg256_scroll_y; main->Bg256_pos_x = gSaveDataBuffer.main.Bg256_pos_x; main->Bg256_pos_y = gSaveDataBuffer.main.Bg256_pos_y; - main->unused38 = gSaveDataBuffer.main.unused38; + main->unk38 = gSaveDataBuffer.main.unk38; main->Bg256_dir = gSaveDataBuffer.main.Bg256_dir; main->horizontolBGScrollSpeed = gSaveDataBuffer.main.horizontolBGScrollSpeed; main->verticalBGScrollSpeed = gSaveDataBuffer.main.verticalBGScrollSpeed; diff --git a/src/script_commands2.c b/src/script_commands2.c index 7aea782..8137213 100644 --- a/src/script_commands2.c +++ b/src/script_commands2.c @@ -29,7 +29,7 @@ struct SpotSelectData /* +0x20 */ u16 firstAreaSection; /* +0x22 */ u16 secondAreaSection; /* +0x24 */ u16 defaultSection; - /* +0x26 */ u16 unused26; // Unused, called a dummy in unity + /* +0x26 */ u16 unk26; // Unused, called a dummy in unity /* +0x28 */ u8 left; /* +0x29 */ u8 top; /* +0x2A */ u8 right; @@ -178,7 +178,7 @@ static const struct SpotSelectData gSpotSelectData[] = { .firstAreaSection = 0xA3, .secondAreaSection = 0xA2, .defaultSection = 0xA1, - .unused26 = 0, + .unk26 = 0, .left = 26, .top = 4, .right = 188, @@ -222,7 +222,7 @@ static const struct SpotSelectData gSpotSelectData[] = { .firstAreaSection = 0xE9, .secondAreaSection = 0xE8, .defaultSection = 0xE7, - .unused26 = 0, + .unk26 = 0, .left = 2, .top = 2, .right = 222, @@ -266,7 +266,7 @@ static const struct SpotSelectData gSpotSelectData[] = { .firstAreaSection = 0xEC, .secondAreaSection = 0xEB, .defaultSection = 0xEB, - .unused26 = 0, + .unk26 = 0, .left = 2, .top = 2, .right = 222, @@ -310,7 +310,7 @@ static const struct SpotSelectData gSpotSelectData[] = { .firstAreaSection = 0xEF, .secondAreaSection = 0xEC, .defaultSection = 0xED, - .unused26 = 0, + .unk26 = 0, .left = 2, .top = 2, .right = 222, @@ -354,7 +354,7 @@ static const struct SpotSelectData gSpotSelectData[] = { .firstAreaSection = 0xDD, .secondAreaSection = 0xDB, .defaultSection = 0xDC, - .unused26 = 0, + .unk26 = 0, .left = 2, .top = 2, .right = 222, @@ -398,7 +398,7 @@ static const struct SpotSelectData gSpotSelectData[] = { .firstAreaSection = 0xD8, .secondAreaSection = 0xD6, .defaultSection = 0xD7, - .unused26 = 0, + .unk26 = 0, .left = 2, .top = 2, .right = 222, @@ -442,7 +442,7 @@ static const struct SpotSelectData gSpotSelectData[] = { .firstAreaSection = 0xC4, .secondAreaSection = 0xC2, .defaultSection = 0xC3, - .unused26 = 0, + .unk26 = 0, .left = 2, .top = 2, .right = 222, diff --git a/src/script_main.c b/src/script_main.c index 0c4fb14..b4e9fa1 100644 --- a/src/script_main.c +++ b/src/script_main.c @@ -174,7 +174,7 @@ void InitScriptSection(struct ScriptContext *scriptCtx) scriptCtx->textY = 0; if (!(gMain.process[GAME_PROCESS] == INVESTIGATION_PROCESS && gMain.process[GAME_PROCESS_STATE] == INVESTIGATION_TALK)) scriptCtx->textSkip = 0; - scriptCtx->unused15 = 0; + scriptCtx->unk15 = 0; scriptCtx->paragraphSkipDelayCounter = 8; scriptCtx->soundCueSkip = 1; scriptCtx->currentSoundCue = 0; diff --git a/src/title_processes.c b/src/title_processes.c index ccf8d0a..20c93c7 100644 --- a/src/title_processes.c +++ b/src/title_processes.c @@ -94,7 +94,7 @@ void TitleScreenProcess(struct Main *main) gInvestigation.pointerFrameCounter = 0; gInvestigation.pointerFrame = 2; main->selectedButton = 0; - main->unused19C |= 4; + main->unk19C |= 4; main->tilemapUpdateBits = 9; StartHardwareBlend(1, 1, 1, 0x1F); SET_PROCESS_PTR(TITLE_SCREEN_PROCESS, 2, 0, 0, main); From cbe43ac4f9cbabfc7aeee29b76f0036ee0b5f45d Mon Sep 17 00:00:00 2001 From: Missingmew Date: Wed, 26 Jun 2024 00:56:35 +0200 Subject: [PATCH 13/17] save until here --- include/ewram.h | 4 ++-- src/animation.c | 21 ++++++--------------- src/court_record.c | 6 +++--- src/gameover_process.c | 6 +++--- sym_ewram.txt | 4 ++-- 5 files changed, 16 insertions(+), 25 deletions(-) diff --git a/include/ewram.h b/include/ewram.h index 9f6bd52..d21b7de 100644 --- a/include/ewram.h +++ b/include/ewram.h @@ -1,9 +1,9 @@ #ifndef GUARD_EWRAM_H #define GUARD_EWRAM_H -#define eUnknown_0200AFC0 ((void *)EWRAM_START+0xAFC0) +#define eGeneralScratchpadBuffer ((void *)EWRAM_START+0xAFC0) #define eScriptHeap ((void*) (EWRAM_START + 0x11FC0)) #define eBGDecompBuffer ((void*) (EWRAM_START + 0x2CFC0)) -#define eUnknown_02031FC0 ((void*) (EWRAM_START + 0x31FC0)) +#define eUnknown_02031FC0 ((void*) (EWRAM_START + 0x31FC0)) // only used in Command46, the data never gets accessed elsewhere #endif//GUARD_EWRAM_H \ No newline at end of file diff --git a/src/animation.c b/src/animation.c index 56845a0..28a059f 100644 --- a/src/animation.c +++ b/src/animation.c @@ -1224,12 +1224,6 @@ void SetAnimationFrameOffset(struct AnimationListEntry *animation, u32 animOffse } } -#ifdef eUnknown_0200AFC0 -#undef eUnknown_0200AFC0 -#endif - -#define eUnknown_0200AFC0 ((struct Rect*)(EWRAM_START+0xAFC0)) - /*** * * Checks to see if a rectangle has collided with any animation, if yes return animation id @@ -1243,9 +1237,9 @@ u32 CheckRectCollisionWithAnim(struct Rect *p) for(animation = gAnimation[0].next; animation != NULL; animation = animation->next) { - struct Rect * rect = &eUnknown_0200AFC0[0]; - struct Rect * collisionRect = &eUnknown_0200AFC0[1]; - struct Rect * spriteRect = &eUnknown_0200AFC0[2]; + struct Rect * rect = eGeneralScratchpadBuffer; + struct Rect * collisionRect = eGeneralScratchpadBuffer + sizeof(struct Rect) * 1; + struct Rect * spriteRect = eGeneralScratchpadBuffer + sizeof(struct Rect) * 2; uintptr_t vram; struct SpriteTemplate * spriteTemplate; u32 spriteCount; @@ -1329,9 +1323,6 @@ u32 CheckRectCollisionWithAnim(struct Rect *p) return 0; } -#undef eUnknown_0200AFC0 -#define eUnknown_0200AFC0 ((void*)(EWRAM_START+0xAFC0)) - bool32 CheckIfLinesIntersect(const struct Point *pt0, const struct Point *pt1, const struct Point *pt2, const struct Point *pt3) { // check if the lines through pt0-pt1 and pt2-pt3 intersect on the screen @@ -1951,7 +1942,7 @@ static void UpdateAllAnimationSprites() s32 yOrigin = animation->animationInfo.yOrigin - gMain.shakeAmountY; u32 tileNum = animation->tileNum & 0xFFF; s32 spriteCount = *(u16 *)ptr; - struct SpriteSizeData *spriteSizeData = eUnknown_0200AFC0; + struct SpriteSizeData *spriteSizeData = eGeneralScratchpadBuffer; spriteSizeData += var0; for (i = 0; i < spriteCount; i++) { @@ -2020,10 +2011,10 @@ void MoveAnimationTilesToRam(bool32 arg0) continue; if(!(animation->flags & ANIM_ACTIVE)) continue; - tileDest = arg0 ? eUnknown_0200AFC0 + 0x200 : animation->animationInfo.vramPtr; + tileDest = arg0 ? eGeneralScratchpadBuffer + 0x200 : animation->animationInfo.vramPtr; spriteTemplate = animation->spriteData; spriteCount = *(u16*)animation->spriteData; - spriteSizeData = eUnknown_0200AFC0; + spriteSizeData = eGeneralScratchpadBuffer; spriteSizeData += animation->animtionOamEndIdx; animation->flags &= ~ANIM_QUEUED_TILE_UPLOAD; palCount = *(u32*)animation->animationInfo.animGfxDataStartPtr; diff --git a/src/court_record.c b/src/court_record.c index bd5afdc..2a65b69 100644 --- a/src/court_record.c +++ b/src/court_record.c @@ -1473,8 +1473,8 @@ void LoadEvidenceGraphics(u32 evidenceId) src = gGfxEvidenceProfilePictures + offset + 0x20; DmaCopy16(3, src, OBJ_VRAM0+0x5000, TILE_SIZE_4BPP * 64); src = gEvidenceProfileData[evidenceId].descriptionTiles; - LZ77UnCompWram(src, eUnknown_0200AFC0); - DmaCopy16(3, eUnknown_0200AFC0, (void *)OBJ_VRAM0+0x3C00, TILE_SIZE_4BPP * 160); + LZ77UnCompWram(src, eGeneralScratchpadBuffer); + DmaCopy16(3, eGeneralScratchpadBuffer, (void *)OBJ_VRAM0+0x3C00, TILE_SIZE_4BPP * 160); } void UpdateEvidenceSprites(struct CourtRecord * courtRecord) @@ -1658,7 +1658,7 @@ s32 FindFirstEmptySlotInCourtRecord(u32 isProfile) void SortCourtRecordAndSyncListCount(struct CourtRecord * courtRecord) { - u8 * ewram = eUnknown_0200AFC0; + u8 * ewram = eGeneralScratchpadBuffer; u32 i; DmaCopy16(3, courtRecord->profileList, ewram, 0x20); diff --git a/src/gameover_process.c b/src/gameover_process.c index f882bc0..92ccd38 100644 --- a/src/gameover_process.c +++ b/src/gameover_process.c @@ -8,7 +8,7 @@ #include "constants/process.h" #include "constants/oam_allocations.h" -const u8 gUnknown_080189A4[152] = { +const u8 gMapTrialGameOverDoors[152] = { 0x01, 0x02, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x04, 0x05, 0x06, 0x07, 0x01, 0x08, 0x16, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x0a, 0x0b, 0x05, 0x06, 0x07, 0x01, 0x08, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x0b, 0x05, 0x06, 0x07, 0x01, 0x08, 0x0c, @@ -67,7 +67,7 @@ void GameOverScreenProcess(struct Main *main) ptr2 += main->process[GAME_PROCESS_VAR1]; for(j = 0; j < main->process[GAME_PROCESS_VAR1]; j++) { - temp = gUnknown_080189A4[0xE - j + i * 0xF] + 0x10A0; + temp = gMapTrialGameOverDoors[0xE - j + i * 0xF] + 0x10A0; *ptr2 = temp; *(ptr2+0x140) = temp; ptr2--; @@ -79,7 +79,7 @@ void GameOverScreenProcess(struct Main *main) ptr2 += 0x1F-main->process[GAME_PROCESS_VAR1]; for(j = 0; j < main->process[GAME_PROCESS_VAR1]; j++) { - temp = gUnknown_080189A4[0xE - j + i * 0xF] + 0x14A0; + temp = gMapTrialGameOverDoors[0xE - j + i * 0xF] + 0x14A0; *ptr2 = temp; *(ptr2+0x140) = temp; ptr2++; diff --git a/sym_ewram.txt b/sym_ewram.txt index 48d5c51..7e69b3d 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -1,5 +1,5 @@ . = 0x00000000; gSaveDataBuffer = .; -. = 0x0000AFC0; gUnknown_0200AFC0 = .; -. = 0x0000B1C0; gUnknown_0200B1C0 = .; +. = 0x0000AFC0; eGeneralScratchpadBuffer = .; . = 0x00011FC0; gScriptHeap = .; . = 0x0002CFC0; gBGDecompBuffer = .; +. = 0x00031FC0; eUnknown_02031FC0 = .; From 400b3d532f13083a1bad70cb505a0f980bc435c8 Mon Sep 17 00:00:00 2001 From: Missingmew Date: Wed, 26 Jun 2024 01:32:49 +0200 Subject: [PATCH 14/17] no gUnknown outside of sound_data --- include/background.h | 2 +- src/bg.c | 14 +++++++------- src/bg3.c | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/include/background.h b/include/background.h index 6daac87..5b4b54d 100644 --- a/include/background.h +++ b/include/background.h @@ -42,7 +42,7 @@ extern u16 gBG3MapBuffer[0x400]; extern u16 gTilemapBuffer[0x400]; extern const u8 gTextboxTiles[0x400]; -extern const u16 gUnknown_08014570[0x2C0]; +extern const u16 gMapSpeedlines[0x2C0]; struct CourtScroll { diff --git a/src/bg.c b/src/bg.c index e477321..72224cc 100644 --- a/src/bg.c +++ b/src/bg.c @@ -81,7 +81,7 @@ const u8 gTextboxTiles[0x400] = { }; -const u16 gUnknown_08013F70[32 * 12] = { +const u16 gMapCourtRecordNormalWindow[32 * 12] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0041, 0x0042, 0x0042, 0x0042, 0x0042, 0x0042, 0x0042, 0x0042, 0x0042, 0x0043, 0x0049, 0x0049, 0x0049, 0x0049, 0x0049, 0x0049, 0x0049, 0x0049, 0x0049, 0x0049, 0x0049, 0x0049, 0x0049, 0x0049, 0x0049, 0x0049, 0x0049, 0x0049, 0x0049, 0x004a, 0x0000, @@ -96,7 +96,7 @@ const u16 gUnknown_08013F70[32 * 12] = { 0x0000, 0x0046, 0x0047, 0x0047, 0x0047, 0x0047, 0x0047, 0x0047, 0x0047, 0x0047, 0x0048, 0x004c, 0x004c, 0x004c, 0x004c, 0x004c, 0x004c, 0x004c, 0x004c, 0x004c, 0x004c, 0x004c, 0x004c, 0x004c, 0x004c, 0x004c, 0x004c, 0x004c, 0x004c, 0x004c, 0x004d, 0x0000 }; -const u16 gUnknown_08014270[32 * 12] = { +const u16 gMapCourtRecordSaveWindow[32 * 12] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x004e, 0x0049, 0x0049, 0x0049, 0x0049, 0x0049, 0x0049, 0x0049, 0x0049, 0x0049, 0x0049, 0x0049, 0x0049, 0x0049, 0x0049, 0x0049, 0x0049, 0x0049, 0x0049, 0x0049, 0x0049, 0x0049, 0x0049, 0x004a, 0x0000, 0x0000, 0x0000, 0x0000, @@ -111,7 +111,7 @@ const u16 gUnknown_08014270[32 * 12] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0050, 0x004c, 0x004c, 0x004c, 0x004c, 0x004c, 0x004c, 0x004c, 0x004c, 0x004c, 0x004c, 0x004c, 0x004c, 0x004c, 0x004c, 0x004c, 0x004c, 0x004c, 0x004c, 0x004c, 0x004c, 0x004c, 0x004c, 0x004d, 0x0000, 0x0000, 0x0000, 0x0000 }; -const u16 gUnknown_08014570[0x2C0] = { +const u16 gMapSpeedlines[0x2C0] = { 0x2276, 0x2276, 0x2276, 0x2276, 0x2276, 0x2276, 0x2276, 0x2276, 0x2276, 0x2276, 0x2276, 0x2276, 0x2276, 0x2276, 0x2276, 0x2276, 0x2276, 0x2276, 0x2276, 0x2276, 0x2276, 0x2276, 0x2276, 0x2276, @@ -401,14 +401,14 @@ void ScrollWindowWithPrevWindow(struct CourtRecord * courtRecord) { for(i = 0x40; i < 0x180; i += 0x20) { - gBG2MapBuffer[i + 31] = gUnknown_08014270[courtRecord->windowTileX + i]; + gBG2MapBuffer[i + 31] = gMapCourtRecordSaveWindow[courtRecord->windowTileX + i]; } } else { for(i = 0x40; i < 0x180; i += 0x20) { - gBG2MapBuffer[i + 31] = gUnknown_08013F70[courtRecord->windowTileX + i]; + gBG2MapBuffer[i + 31] = gMapCourtRecordNormalWindow[courtRecord->windowTileX + i]; } } } @@ -432,14 +432,14 @@ void ScrollWindowWithPrevWindow(struct CourtRecord * courtRecord) { for(i = 0x40; i < 0x180; i += 0x20) { - gBG2MapBuffer[i] = gUnknown_08014270[courtRecord->windowTileX + i]; + gBG2MapBuffer[i] = gMapCourtRecordSaveWindow[courtRecord->windowTileX + i]; } } else { for(i = 0x40; i < 0x180; i += 0x20) { - gBG2MapBuffer[i] = gUnknown_08013F70[courtRecord->windowTileX + i]; + gBG2MapBuffer[i] = gMapCourtRecordNormalWindow[courtRecord->windowTileX + i]; } } } diff --git a/src/bg3.c b/src/bg3.c index 45e99f2..ff8111c 100644 --- a/src/bg3.c +++ b/src/bg3.c @@ -682,9 +682,9 @@ void CopyBGDataToVram(u32 bgId) main->currentBG = bgId; if(bgId == 0xFF) { - src = gUnknown_08014570; + src = gMapSpeedlines; dst = gBG3MapBuffer; - DmaCopy16(3, src, dst, sizeof(gUnknown_08014570)); + DmaCopy16(3, src, dst, sizeof(gMapSpeedlines)); DmaFill16(3, 0, BG_PLTT+0x40, 0x1C0); DmaFill16(3, 0x2222, VRAM+0x4000, 0x9600); return; @@ -693,9 +693,9 @@ void CopyBGDataToVram(u32 bgId) if(i & BG_MODE_SPECIAL_SPEEDLINE) { //u32 temp; - src = gUnknown_08014570; + src = gMapSpeedlines; dst = gBG3MapBuffer; - DmaCopy16(3, src, dst, sizeof(gUnknown_08014570)); + DmaCopy16(3, src, dst, sizeof(gMapSpeedlines)); j = 0x258; j++;j--; for(i = 0; i < 20; i++, j++) @@ -773,9 +773,9 @@ void CopyBGDataToVram(u32 bgId) { if((tempBgCtrl & BG_MODE_SPECIAL_SPEEDLINE) == 0) { - src = gUnknown_08014570; + src = gMapSpeedlines; dst = gBG3MapBuffer; - DmaCopy16(3, src, dst, sizeof(gUnknown_08014570)); + DmaCopy16(3, src, dst, sizeof(gMapSpeedlines)); } src = gBG3MapBuffer; dst = (void *)BG_SCREEN_ADDR(31); From 8477af941eaed8b3930e91cde777fdf17327eb03 Mon Sep 17 00:00:00 2001 From: Missingmew Date: Wed, 26 Jun 2024 01:42:42 +0200 Subject: [PATCH 15/17] done for today --- data/graphics.s | 65 ------------------------------------------------- 1 file changed, 65 deletions(-) diff --git a/data/graphics.s b/data/graphics.s index ba2b05a..34fe3df 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -648,261 +648,196 @@ gGfxEvidenceMissileAngry_description: .global gGfxEvidenceProfilePictures gGfxEvidenceProfilePictures: - .incbin "graphics/evidence_profile_pictures/evidence/empty_plate.gbapal" - .incbin "graphics/evidence_profile_pictures/evidence/empty_plate.4bpp" .incbin "graphics/evidence_profile_pictures/evidence/lottas_camera.gbapal" - .incbin "graphics/evidence_profile_pictures/evidence/lottas_camera.4bpp" .incbin "graphics/evidence_profile_pictures/evidence/wiretap.gbapal" - .incbin "graphics/evidence_profile_pictures/evidence/wiretap.4bpp" .incbin "graphics/evidence_profile_pictures/evidence/mayas_cellphone.gbapal" - .incbin "graphics/evidence_profile_pictures/evidence/mayas_cellphone.4bpp" .incbin "graphics/evidence_profile_pictures/evidence/article_gourdy.gbapal" - .incbin "graphics/evidence_profile_pictures/evidence/article_gourdy.4bpp" .incbin "graphics/evidence_profile_pictures/evidence/bullet.gbapal" - .incbin "graphics/evidence_profile_pictures/evidence/bullet.4bpp" .incbin "graphics/evidence_profile_pictures/evidence/phoenix_badge.gbapal" - .incbin "graphics/evidence_profile_pictures/evidence/phoenix_badge.4bpp" .incbin "graphics/evidence_profile_pictures/evidence/generic_letter.gbapal" - .incbin "graphics/evidence_profile_pictures/evidence/generic_letter.4bpp" .incbin "graphics/evidence_profile_pictures/evidence/note_from_the_safe.gbapal" - .incbin "graphics/evidence_profile_pictures/evidence/note_from_the_safe.4bpp" .incbin "graphics/evidence_profile_pictures/evidence/generic_photo.gbapal" - .incbin "graphics/evidence_profile_pictures/evidence/generic_photo.4bpp" .incbin "graphics/evidence_profile_pictures/profiles/dick_gumshoe.gbapal" - .incbin "graphics/evidence_profile_pictures/profiles/dick_gumshoe.4bpp" .incbin "graphics/evidence_profile_pictures/profiles/april_may.gbapal" - .incbin "graphics/evidence_profile_pictures/profiles/april_may.4bpp" .incbin "graphics/evidence_profile_pictures/profiles/bellboy.gbapal" - .incbin "graphics/evidence_profile_pictures/profiles/bellboy.4bpp" .incbin "graphics/evidence_profile_pictures/profiles/redd_white.gbapal" - .incbin "graphics/evidence_profile_pictures/profiles/redd_white.4bpp" .incbin "graphics/evidence_profile_pictures/evidence/the_thinker.gbapal" - .incbin "graphics/evidence_profile_pictures/evidence/the_thinker.4bpp" .incbin "graphics/evidence_profile_pictures/evidence/cindy_stones_passport.gbapal" - .incbin "graphics/evidence_profile_pictures/evidence/cindy_stones_passport.4bpp" .incbin "graphics/evidence_profile_pictures/evidence/generic_autopsy_report.gbapal" - .incbin "graphics/evidence_profile_pictures/evidence/generic_autopsy_report.4bpp" .incbin "graphics/evidence_profile_pictures/evidence/generic_affidavit.gbapal" - .incbin "graphics/evidence_profile_pictures/evidence/generic_affidavit.4bpp" .incbin "graphics/evidence_profile_pictures/profiles/mia_fey.gbapal" - .incbin "graphics/evidence_profile_pictures/profiles/mia_fey.4bpp" .incbin "graphics/evidence_profile_pictures/profiles/larry_butz.gbapal" - .incbin "graphics/evidence_profile_pictures/profiles/larry_butz.4bpp" .incbin "graphics/evidence_profile_pictures/profiles/cindy_stone.gbapal" - .incbin "graphics/evidence_profile_pictures/profiles/cindy_stone.4bpp" .incbin "graphics/evidence_profile_pictures/profiles/frank_sahwit.gbapal" - .incbin "graphics/evidence_profile_pictures/profiles/frank_sahwit.4bpp" .incbin "graphics/evidence_profile_pictures/profiles/winston_payne.gbapal" - .incbin "graphics/evidence_profile_pictures/profiles/winston_payne.4bpp" .incbin "graphics/evidence_profile_pictures/profiles/maya_fey.gbapal" - .incbin "graphics/evidence_profile_pictures/profiles/maya_fey.4bpp" .incbin "graphics/evidence_profile_pictures/evidence/maya_memo.gbapal" - .incbin "graphics/evidence_profile_pictures/evidence/maya_memo.4bpp" .incbin "graphics/evidence_profile_pictures/evidence/steel_samurai_spear.gbapal" - .incbin "graphics/evidence_profile_pictures/evidence/steel_samurai_spear.4bpp" .incbin "graphics/evidence_profile_pictures/evidence/glass_shards.gbapal" - .incbin "graphics/evidence_profile_pictures/evidence/glass_shards.4bpp" .incbin "graphics/evidence_profile_pictures/evidence/generic_newspaper_clipping.gbapal" - .incbin "graphics/evidence_profile_pictures/evidence/generic_newspaper_clipping.4bpp" .incbin "graphics/evidence_profile_pictures/profiles/misty_fey.gbapal" - .incbin "graphics/evidence_profile_pictures/profiles/misty_fey.4bpp" .incbin "graphics/evidence_profile_pictures/profiles/marvin_grossberg.gbapal" - .incbin "graphics/evidence_profile_pictures/profiles/marvin_grossberg.4bpp" .incbin "graphics/evidence_profile_pictures/profiles/miles_edgeworth.gbapal" - .incbin "graphics/evidence_profile_pictures/profiles/miles_edgeworth.4bpp" .incbin "graphics/evidence_profile_pictures/evidence/steel_samurai_cards.gbapal" - .incbin "graphics/evidence_profile_pictures/evidence/steel_samurai_cards.4bpp" .incbin "graphics/evidence_profile_pictures/evidence/steel_samurai_ultra_rare_card.gbapal" - .incbin "graphics/evidence_profile_pictures/evidence/steel_samurai_ultra_rare_card.4bpp" .incbin "graphics/evidence_profile_pictures/evidence/empty_bottle.gbapal" - .incbin "graphics/evidence_profile_pictures/evidence/empty_bottle.4bpp" .incbin "graphics/evidence_profile_pictures/evidence/steel_samurai_script.gbapal" - .incbin "graphics/evidence_profile_pictures/evidence/steel_samurai_script.4bpp" .incbin "graphics/evidence_profile_pictures/evidence/codys_digital_camera.gbapal" - .incbin "graphics/evidence_profile_pictures/evidence/codys_digital_camera.4bpp" .incbin "graphics/evidence_profile_pictures/evidence/plate_with_steak_bones.gbapal" - .incbin "graphics/evidence_profile_pictures/evidence/plate_with_steak_bones.4bpp" .incbin "graphics/evidence_profile_pictures/evidence/global_studios_card_key.gbapal" - .incbin "graphics/evidence_profile_pictures/evidence/global_studios_card_key.4bpp" .incbin "graphics/evidence_profile_pictures/evidence/key_to_cottage.gbapal" - .incbin "graphics/evidence_profile_pictures/evidence/key_to_cottage.4bpp" .incbin "graphics/evidence_profile_pictures/evidence/mr_monkey.gbapal" - .incbin "graphics/evidence_profile_pictures/evidence/mr_monkey.4bpp" .incbin "graphics/evidence_profile_pictures/evidence/codys_steel_samurai_scrapbook.gbapal" - .incbin "graphics/evidence_profile_pictures/evidence/codys_steel_samurai_scrapbook.4bpp" .incbin "graphics/evidence_profile_pictures/evidence/global_studios_van.gbapal" - .incbin "graphics/evidence_profile_pictures/evidence/global_studios_van.4bpp" .incbin "graphics/evidence_profile_pictures/profiles/cody_hackins.gbapal" - .incbin "graphics/evidence_profile_pictures/profiles/cody_hackins.4bpp" .incbin "graphics/evidence_profile_pictures/profiles/will_powers.gbapal" - .incbin "graphics/evidence_profile_pictures/profiles/will_powers.4bpp" .incbin "graphics/evidence_profile_pictures/profiles/dee_vasquez.gbapal" - .incbin "graphics/evidence_profile_pictures/profiles/dee_vasquez.4bpp" .incbin "graphics/evidence_profile_pictures/profiles/penny_nichols.gbapal" - .incbin "graphics/evidence_profile_pictures/profiles/penny_nichols.4bpp" .incbin "graphics/evidence_profile_pictures/profiles/sal_manella.gbapal" - .incbin "graphics/evidence_profile_pictures/profiles/sal_manella.4bpp" .incbin "graphics/evidence_profile_pictures/profiles/jack_hammer.gbapal" - .incbin "graphics/evidence_profile_pictures/profiles/jack_hammer.4bpp" .incbin "graphics/evidence_profile_pictures/profiles/wendy_oldbag.gbapal" - .incbin "graphics/evidence_profile_pictures/profiles/wendy_oldbag.4bpp" .incbin "graphics/evidence_profile_pictures/evidence/firecrackers.gbapal" - .incbin "graphics/evidence_profile_pictures/evidence/firecrackers.4bpp" .incbin "graphics/evidence_profile_pictures/evidence/pistol.gbapal" - .incbin "graphics/evidence_profile_pictures/evidence/pistol.4bpp" .incbin "graphics/evidence_profile_pictures/evidence/air_tube.gbapal" - .incbin "graphics/evidence_profile_pictures/evidence/air_tube.4bpp" .incbin "graphics/evidence_profile_pictures/evidence/metal_detector.gbapal" - .incbin "graphics/evidence_profile_pictures/evidence/metal_detector.4bpp" .incbin "graphics/evidence_profile_pictures/evidence/missile.gbapal" - .incbin "graphics/evidence_profile_pictures/evidence/missile.4bpp" .incbin "graphics/evidence_profile_pictures/evidence/missile_angry.gbapal" - .incbin "graphics/evidence_profile_pictures/evidence/missile_angry.4bpp" .incbin "graphics/evidence_profile_pictures/evidence/dl-6_bullet.gbapal" - .incbin "graphics/evidence_profile_pictures/evidence/dl-6_bullet.4bpp" .incbin "graphics/evidence_profile_pictures/evidence/fishing_pole.gbapal" - .incbin "graphics/evidence_profile_pictures/evidence/fishing_pole.4bpp" .incbin "graphics/evidence_profile_pictures/evidence/polly.gbapal" - .incbin "graphics/evidence_profile_pictures/evidence/polly.4bpp" .incbin "graphics/evidence_profile_pictures/profiles/lotta_hart.gbapal" - .incbin "graphics/evidence_profile_pictures/profiles/lotta_hart.4bpp" .incbin "graphics/evidence_profile_pictures/profiles/manfred_von_karma.gbapal" - .incbin "graphics/evidence_profile_pictures/profiles/manfred_von_karma.4bpp" .incbin "graphics/evidence_profile_pictures/profiles/gregory_edgeworth.gbapal" - .incbin "graphics/evidence_profile_pictures/profiles/gregory_edgeworth.4bpp" .incbin "graphics/evidence_profile_pictures/profiles/robert_hammond.gbapal" - .incbin "graphics/evidence_profile_pictures/profiles/robert_hammond.4bpp" .incbin "graphics/evidence_profile_pictures/profiles/old_man.gbapal" - .incbin "graphics/evidence_profile_pictures/profiles/old_man.4bpp" .incbin "graphics/evidence_profile_pictures/evidence/yannis_safe.gbapal" - .incbin "graphics/evidence_profile_pictures/evidence/yannis_safe.4bpp" @ END EVIDENCE AND PROFILE PICTURES From 2bf0d160609e81a620b2bcb734823b6fd853ad67 Mon Sep 17 00:00:00 2001 From: Missingmew Date: Wed, 26 Jun 2024 23:19:40 +0200 Subject: [PATCH 16/17] get rid of eUnknown, some unk members --- include/animation.h | 8 ++--- include/ewram.h | 4 +-- include/investigation.h | 2 +- src/animation.c | 54 ++++++++++++++++----------------- src/investigation_segment_1_0.c | 28 ++++++++--------- src/investigation_segment_1_2.c | 26 ++++++++-------- src/investigation_segment_2_0.c | 34 ++++++++++----------- src/investigation_segment_2_2.c | 36 +++++++++++----------- src/investigation_segment_2_4.c | 26 ++++++++-------- src/investigation_segment_3_0.c | 48 ++++++++++++++--------------- src/investigation_segment_3_2.c | 36 +++++++++++----------- src/investigation_segment_3_4.c | 24 +++++++-------- src/script_commands3.c | 2 +- 13 files changed, 164 insertions(+), 164 deletions(-) diff --git a/include/animation.h b/include/animation.h index 3be2ae0..ee828fb 100644 --- a/include/animation.h +++ b/include/animation.h @@ -32,7 +32,7 @@ struct AnimationInfo { /* +0x00 */ u16 animId; /* +0x02 */ u8 personId; - /* +0x03 */ u8 unk3; // padding? + /* +0x03 */ u8 filler3; // padding? /* +0x04 */ s16 xOrigin; /* +0x06 */ s16 yOrigin; /* +0x08 */ u8 *volatile animFrameDataStartPtr; // !! THESE 4 POINTERS ARE VOLATILE TO MATCH MoveAnimationTilesToRam AND THAT COULD BE INCORRECT @@ -42,7 +42,7 @@ struct AnimationInfo /* +0x18 */ u8 paletteSlot; /* +0x19 */ u8 spriteCount; /* +0x1A */ u8 priority; - /* +0x1B */ u8 filler1B[1]; + /* +0x1B */ u8 filler1B; }; struct SpriteTemplate { @@ -76,7 +76,7 @@ struct AnimationBackupStruct { /* +0x00 */ u16 animId; /* +0x02 */ u8 personId; - /* +0x03 */ u8 unk3; // padding? + /* +0x03 */ u8 filler3; // animationInfo.filler3 /* +0x04 */ s16 xOrigin; /* +0x06 */ s16 yOrigin; /* +0x08 */ u8 * animFrameDataStartPtr; @@ -95,7 +95,7 @@ struct PersonAnimationData /* +0x00 */ u8* gfxData; /* +0x04 */ u8* frameData; /* +0x08 */ u16 spriteCount; - /* +0x0A */ u16 unkA; // padding? + /* +0x0A */ u16 fillerA; // padding? }; struct AnimationData diff --git a/include/ewram.h b/include/ewram.h index d21b7de..b882bd8 100644 --- a/include/ewram.h +++ b/include/ewram.h @@ -4,6 +4,6 @@ #define eGeneralScratchpadBuffer ((void *)EWRAM_START+0xAFC0) #define eScriptHeap ((void*) (EWRAM_START + 0x11FC0)) #define eBGDecompBuffer ((void*) (EWRAM_START + 0x2CFC0)) -#define eUnknown_02031FC0 ((void*) (EWRAM_START + 0x31FC0)) // only used in Command46, the data never gets accessed elsewhere +#define eVRAMScratchpadBuffer ((void*) (EWRAM_START + 0x31FC0)) // only used in Command46, the data never gets accessed elsewhere -#endif//GUARD_EWRAM_H \ No newline at end of file +#endif//GUARD_EWRAM_H diff --git a/include/investigation.h b/include/investigation.h index 158fde5..19e4600 100644 --- a/include/investigation.h +++ b/include/investigation.h @@ -8,7 +8,7 @@ struct TalkData { /* +0x00 */ u8 roomId; /* +0x01 */ u8 personId; - /* +0x02 */ u8 unk2; // called dm in unity? probably means dummy, unused + /* +0x02 */ u8 filler2; // called dm in unity? probably means dummy, unused /* +0x03 */ u8 enableFlag; // en- or disables this specific set of talk data, allows for multiple sets for one character in one room /* +0x04 */ u8 iconId[0x4]; /* +0x08 */ u8 talkFlagId[0x4]; diff --git a/src/animation.c b/src/animation.c index 28a059f..51424a2 100644 --- a/src/animation.c +++ b/src/animation.c @@ -11,7 +11,7 @@ #include "constants/process.h" #include "constants/animation_offsets.h" -#define DUMMYPERSON { .gfxData = 0, .frameData = 0, .spriteCount = 0, .unkA = 0 } +#define DUMMYPERSON { .gfxData = 0, .frameData = 0, .spriteCount = 0, .fillerA = 0 } #define DUMMYANIMATION { .gfxData = 0, .vramPtr = 0, .frameData = 0, .xOrigin = 0, .yOrigin = 0, .paletteSlot = 0, .spriteCount = 0, .priority = 0, .flags = 0x0, } const struct PersonAnimationData gPersonAnimData[] = { @@ -21,52 +21,52 @@ const struct PersonAnimationData gPersonAnimData[] = { .gfxData = gGfxPixAnimationChar01, .frameData = gGfxSeqAnimationChar01, .spriteCount = 37, - .unkA = 0x0, + .fillerA = 0x0, }, [PERSON_ANIM_DUMMY03] = DUMMYPERSON, [PERSON_ANIM_MAYA] = { .gfxData = gGfxPixAnimationChar02, .frameData = gGfxSeqAnimationChar02, .spriteCount = 28, - .unkA = 0x0, + .fillerA = 0x0, }, [PERSON_ANIM_SUMMONED_MIA] = { .gfxData = gGfxPixAnimationChar03, .frameData = gGfxSeqAnimationChar03, .spriteCount = 28, - .unkA = 0x0, + .fillerA = 0x0, }, [PERSON_ANIM_DUMMY06] = DUMMYPERSON, [PERSON_ANIM_MIA] = { .gfxData = gGfxPixAnimationChar04, .frameData = gGfxSeqAnimationChar04, .spriteCount = 28, - .unkA = 0x0, + .fillerA = 0x0, }, [PERSON_ANIM_JUDGE] = { .gfxData = gGfxPixAnimationChar05, .frameData = gGfxSeqAnimationChar05, .spriteCount = 19, - .unkA = 0x0, + .fillerA = 0x0, }, [PERSON_ANIM_EDGEWORTH] = { .gfxData = gGfxPixAnimationChar06, .frameData = gGfxSeqAnimationChar06, .spriteCount = 38, - .unkA = 0x0, + .fillerA = 0x0, }, [PERSON_ANIM_WINSTON_PAYNE] = { .gfxData = gGfxPixAnimationChar10, .frameData = gGfxSeqAnimationChar10, .spriteCount = 23, - .unkA = 0x0, + .fillerA = 0x0, }, [PERSON_ANIM_DUMMY11] = DUMMYPERSON, [PERSON_ANIM_MARVIN_GROSSBERG] = { .gfxData = gGfxPixAnimationChar14, .frameData = gGfxSeqAnimationChar14, .spriteCount = 33, - .unkA = 0x0, + .fillerA = 0x0, }, [PERSON_ANIM_DUMMY13] = DUMMYPERSON, [PERSON_ANIM_DUMMY14] = DUMMYPERSON, @@ -75,110 +75,110 @@ const struct PersonAnimationData gPersonAnimData[] = { .gfxData = gGfxPixAnimationChar16, .frameData = gGfxSeqAnimationChar16, .spriteCount = 14, - .unkA = 0x0, + .fillerA = 0x0, }, [PERSON_ANIM_WENDY_OLDBAG] = { .gfxData = gGfxPixAnimationChar15, .frameData = gGfxSeqAnimationChar15, .spriteCount = 29, - .unkA = 0x0, + .fillerA = 0x0, }, [PERSON_ANIM_SAL_MANELLA] = { .gfxData = gGfxPixAnimationChar18, .frameData = gGfxSeqAnimationChar18, .spriteCount = 39, - .unkA = 0x0, + .fillerA = 0x0, }, [PERSON_ANIM_DUMMY19] = DUMMYPERSON, [PERSON_ANIM_GUMSHOE] = { .gfxData = gGfxPixAnimationChar07, .frameData = gGfxSeqAnimationChar07, .spriteCount = 39, - .unkA = 0x0, + .fillerA = 0x0, }, [PERSON_ANIM_REDD_WHITE] = { .gfxData = gGfxPixAnimationChar08, .frameData = gGfxSeqAnimationChar08, .spriteCount = 36, - .unkA = 0x0, + .fillerA = 0x0, }, [PERSON_ANIM_APRIL_MAY] = { .gfxData = gGfxPixAnimationChar09, .frameData = gGfxSeqAnimationChar09, .spriteCount = 30, - .unkA = 0x0, + .fillerA = 0x0, }, [PERSON_ANIM_BELLBOY] = { .gfxData = gGfxPixAnimationChar11, .frameData = gGfxSeqAnimationChar11, .spriteCount = 35, - .unkA = 0x0, + .fillerA = 0x0, }, [PERSON_ANIM_DEE_VASQUEZ] = { .gfxData = gGfxPixAnimationChar19, .frameData = gGfxSeqAnimationChar19, .spriteCount = 29, - .unkA = 0x0, + .fillerA = 0x0, }, [PERSON_ANIM_LARRY_BUTZ] = { .gfxData = gGfxPixAnimationChar12, .frameData = gGfxSeqAnimationChar12, .spriteCount = 39, - .unkA = 0x0, + .fillerA = 0x0, }, [PERSON_ANIM_FRANK_SAWHIT] = { .gfxData = gGfxPixAnimationChar13, .frameData = gGfxSeqAnimationChar13, .spriteCount = 38, - .unkA = 0x0, + .fillerA = 0x0, }, [PERSON_ANIM_WILL_POWERS] = { .gfxData = gGfxPixAnimationChar17, .frameData = gGfxSeqAnimationChar17, .spriteCount = 39, - .unkA = 0x0, + .fillerA = 0x0, }, [PERSON_ANIM_CODY_HACKINS] = { .gfxData = gGfxPixAnimationChar20, .frameData = gGfxSeqAnimationChar20, .spriteCount = 18, - .unkA = 0x0, + .fillerA = 0x0, }, [PERSON_ANIM_BUSTUP_PHOENIX] = { .gfxData = gGfxPixAnimationChar21, .frameData = gGfxSeqAnimationChar21, .spriteCount = 7, - .unkA = 0x0, + .fillerA = 0x0, }, [PERSON_ANIM_BUSTUP_EDGEWORTH] = { .gfxData = gGfxPixAnimationChar22, .frameData = gGfxSeqAnimationChar22, .spriteCount = 10, - .unkA = 0x0, + .fillerA = 0x0, }, [PERSON_ANIM_LOTTA_HART] = { .gfxData = gGfxPixAnimationChar23, .frameData = gGfxSeqAnimationChar23, .spriteCount = 24, - .unkA = 0x0, + .fillerA = 0x0, }, [PERSON_ANIM_YANNI_YOGI] = { .gfxData = gGfxPixAnimationChar24, .frameData = gGfxSeqAnimationChar24, .spriteCount = 29, - .unkA = 0x0, + .fillerA = 0x0, }, [PERSON_ANIM_MANFRED_VONKARMA] = { .gfxData = gGfxPixAnimationChar25, .frameData = gGfxSeqAnimationChar25, .spriteCount = 36, - .unkA = 0x0, + .fillerA = 0x0, }, [PERSON_ANIM_POLLY] = { .gfxData = gGfxPixAnimationChar26, .frameData = gGfxSeqAnimationChar26, .spriteCount = 10, - .unkA = 0x0, + .fillerA = 0x0, }, }; diff --git a/src/investigation_segment_1_0.c b/src/investigation_segment_1_0.c index 516cba6..3ced57c 100644 --- a/src/investigation_segment_1_0.c +++ b/src/investigation_segment_1_0.c @@ -476,7 +476,7 @@ const struct TalkData gTalkData_1_0[14] = { { .roomId = 0x0, .personId = PERSON_ANIM_MAYA, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x1, 0x2, 0xFF, 0xFF }, .talkFlagId = { 0x1, 0x2, 0xFF, 0xFF }, @@ -485,7 +485,7 @@ const struct TalkData gTalkData_1_0[14] = { { .roomId = 0x0, .personId = PERSON_ANIM_MAYA, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x1, 0x2, 0x0, 0xFF }, .talkFlagId = { 0x1, 0x2, 0x0, 0xFF }, @@ -494,7 +494,7 @@ const struct TalkData gTalkData_1_0[14] = { { .roomId = 0x2, .personId = PERSON_ANIM_MAYA, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x4, 0x6, 0xFF, 0xFF }, .talkFlagId = { 0x4, 0x3, 0xFF, 0xFF }, @@ -503,7 +503,7 @@ const struct TalkData gTalkData_1_0[14] = { { .roomId = 0x2, .personId = PERSON_ANIM_MAYA, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x4, 0x6, 0x8, 0xFF }, .talkFlagId = { 0x4, 0x3, 0x5, 0xFF }, @@ -512,7 +512,7 @@ const struct TalkData gTalkData_1_0[14] = { { .roomId = 0x2, .personId = PERSON_ANIM_MAYA, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x4, 0x6, 0x7, 0xFF }, .talkFlagId = { 0x4, 0x3, 0x6, 0xFF }, @@ -521,7 +521,7 @@ const struct TalkData gTalkData_1_0[14] = { { .roomId = 0x2, .personId = PERSON_ANIM_MAYA, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x4, 0x6, 0x8, 0x7 }, .talkFlagId = { 0x4, 0x3, 0x5, 0x6 }, @@ -530,7 +530,7 @@ const struct TalkData gTalkData_1_0[14] = { { .roomId = 0x0, .personId = PERSON_ANIM_GUMSHOE, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x3, 0x4, 0xFF, 0xFF }, .talkFlagId = { 0x7, 0x8, 0xFF, 0xFF }, @@ -539,7 +539,7 @@ const struct TalkData gTalkData_1_0[14] = { { .roomId = 0x0, .personId = PERSON_ANIM_GUMSHOE, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x3, 0x4, 0x5, 0xFF }, .talkFlagId = { 0x7, 0x8, 0x9, 0xFF }, @@ -548,7 +548,7 @@ const struct TalkData gTalkData_1_0[14] = { { .roomId = 0x5, .personId = PERSON_ANIM_APRIL_MAY, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0xC, 0xD, 0xE, 0xFF }, .talkFlagId = { 0xA, 0xB, 0xC, 0xFF }, @@ -557,7 +557,7 @@ const struct TalkData gTalkData_1_0[14] = { { .roomId = 0x2, .personId = PERSON_ANIM_MAYA, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x6, 0x9, 0xFF, 0xFF }, .talkFlagId = { 0x3, 0xD, 0xFF, 0xFF }, @@ -566,7 +566,7 @@ const struct TalkData gTalkData_1_0[14] = { { .roomId = 0x2, .personId = PERSON_ANIM_MAYA, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x6, 0x9, 0xA, 0xFF }, .talkFlagId = { 0x3, 0xD, 0xE, 0xFF }, @@ -575,7 +575,7 @@ const struct TalkData gTalkData_1_0[14] = { { .roomId = 0x2, .personId = PERSON_ANIM_MAYA, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x6, 0x9, 0xA, 0xB }, .talkFlagId = { 0x3, 0xD, 0xE, 0xF }, @@ -584,7 +584,7 @@ const struct TalkData gTalkData_1_0[14] = { { .roomId = 0x3, .personId = PERSON_ANIM_MARVIN_GROSSBERG, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0xF, 0x3, 0x10, 0xFF }, .talkFlagId = { 0x10, 0x11, 0x12, 0xFF }, @@ -593,7 +593,7 @@ const struct TalkData gTalkData_1_0[14] = { { .roomId = 0xFF, .personId = 0xFF, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0xFF, .iconId = { 0xFF, 0xFF, 0xFF, 0xFF }, .talkFlagId = { 0xFF, 0xFF, 0xFF, 0xFF }, diff --git a/src/investigation_segment_1_2.c b/src/investigation_segment_1_2.c index cd9ae97..0ce0dcf 100644 --- a/src/investigation_segment_1_2.c +++ b/src/investigation_segment_1_2.c @@ -114,7 +114,7 @@ const struct TalkData gTalkData_1_2[13] = { { .roomId = 0x2, .personId = PERSON_ANIM_APRIL_MAY, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x11, 0x12, 0x13, 0xFF }, .talkFlagId = { 0x13, 0x15, 0x14, 0xFF }, @@ -123,7 +123,7 @@ const struct TalkData gTalkData_1_2[13] = { { .roomId = 0x2, .personId = PERSON_ANIM_APRIL_MAY, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x11, 0x12, 0x13, 0xFF }, .talkFlagId = { 0x16, 0x15, 0x14, 0xFF }, @@ -132,7 +132,7 @@ const struct TalkData gTalkData_1_2[13] = { { .roomId = 0x2, .personId = PERSON_ANIM_APRIL_MAY, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x12, 0x13, 0xFF, 0xFF }, .talkFlagId = { 0x15, 0x14, 0xFF, 0xFF }, @@ -141,7 +141,7 @@ const struct TalkData gTalkData_1_2[13] = { { .roomId = 0x3, .personId = PERSON_ANIM_MARVIN_GROSSBERG, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x14, 0x15, 0x16, 0xFF }, .talkFlagId = { 0x18, 0x19, 0x1A, 0xFF }, @@ -150,7 +150,7 @@ const struct TalkData gTalkData_1_2[13] = { { .roomId = 0x3, .personId = PERSON_ANIM_MARVIN_GROSSBERG, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x14, 0x15, 0x16, 0xFF }, .talkFlagId = { 0x18, 0x19, 0x1A, 0xFF }, @@ -159,7 +159,7 @@ const struct TalkData gTalkData_1_2[13] = { { .roomId = 0x3, .personId = PERSON_ANIM_MARVIN_GROSSBERG, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x14, 0x15, 0x17, 0xFF }, .talkFlagId = { 0x1E, 0x1F, 0x20, 0xFF }, @@ -168,7 +168,7 @@ const struct TalkData gTalkData_1_2[13] = { { .roomId = 0x3, .personId = PERSON_ANIM_MARVIN_GROSSBERG, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x14, 0x15, 0x18, 0x19 }, .talkFlagId = { 0x1E, 0x1F, 0x21, 0x22 }, @@ -177,7 +177,7 @@ const struct TalkData gTalkData_1_2[13] = { { .roomId = 0x4, .personId = PERSON_ANIM_REDD_WHITE, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x1A, 0x1D, 0x1E, 0xFF }, .talkFlagId = { 0x26, 0x27, 0x28, 0xFF }, @@ -186,7 +186,7 @@ const struct TalkData gTalkData_1_2[13] = { { .roomId = 0x4, .personId = PERSON_ANIM_REDD_WHITE, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x1A, 0x1D, 0x1E, 0x16 }, .talkFlagId = { 0x26, 0x27, 0x28, 0x29 }, @@ -195,7 +195,7 @@ const struct TalkData gTalkData_1_2[13] = { { .roomId = 0x4, .personId = PERSON_ANIM_REDD_WHITE, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x1A, 0x1D, 0x1E, 0x16 }, .talkFlagId = { 0x26, 0x27, 0x28, 0x29 }, @@ -204,7 +204,7 @@ const struct TalkData gTalkData_1_2[13] = { { .roomId = 0x4, .personId = PERSON_ANIM_REDD_WHITE, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x1A, 0x1D, 0x1F, 0xFF }, .talkFlagId = { 0x2E, 0x2F, 0x30, 0xFF }, @@ -213,7 +213,7 @@ const struct TalkData gTalkData_1_2[13] = { { .roomId = 0x5, .personId = PERSON_ANIM_BELLBOY, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x1A, 0x1B, 0x1C, 0xFF }, .talkFlagId = { 0x23, 0x24, 0x25, 0xFF }, @@ -222,7 +222,7 @@ const struct TalkData gTalkData_1_2[13] = { { .roomId = 0xFF, .personId = 0xFF, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0xFF, .iconId = { 0xFF, 0xFF, 0xFF, 0xFF }, .talkFlagId = { 0xFF, 0xFF, 0xFF, 0xFF }, diff --git a/src/investigation_segment_2_0.c b/src/investigation_segment_2_0.c index 079e0de..2ce9b33 100644 --- a/src/investigation_segment_2_0.c +++ b/src/investigation_segment_2_0.c @@ -358,7 +358,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0x6, .personId = PERSON_ANIM_MAYA, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x20, 0x21, 0xFF, 0xFF }, .talkFlagId = { 0x31, 0x32, 0xFF, 0xFF }, @@ -367,7 +367,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0x6, .personId = PERSON_ANIM_MAYA, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x20, 0x22, 0xFF, 0xFF }, .talkFlagId = { 0x33, 0x34, 0xFF, 0xFF }, @@ -376,7 +376,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0x2, .personId = PERSON_ANIM_WILL_POWERS, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x23, 0x24, 0xFF, 0xFF }, .talkFlagId = { 0x35, 0x36, 0xFF, 0xFF }, @@ -385,7 +385,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0x2, .personId = PERSON_ANIM_WILL_POWERS, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x23, 0x24, 0x25, 0xFF }, .talkFlagId = { 0x35, 0x36, 0x37, 0xFF }, @@ -394,7 +394,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0x2, .personId = PERSON_ANIM_WILL_POWERS, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x26, 0x27, 0x24, 0xFF }, .talkFlagId = { 0x38, 0x39, 0x36, 0xFF }, @@ -403,7 +403,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0x7, .personId = PERSON_ANIM_WENDY_OLDBAG, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x28, 0x29, 0xFF, 0xFF }, .talkFlagId = { 0x3A, 0x3B, 0xFF, 0xFF }, @@ -412,7 +412,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0x7, .personId = PERSON_ANIM_WENDY_OLDBAG, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x28, 0x29, 0x2A, 0xFF }, .talkFlagId = { 0x3A, 0x3B, 0x3C, 0xFF }, @@ -421,7 +421,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0x7, .personId = PERSON_ANIM_WENDY_OLDBAG, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x28, 0x29, 0x2B, 0xFF }, .talkFlagId = { 0x3A, 0x3B, 0x3D, 0xFF }, @@ -430,7 +430,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0x7, .personId = PERSON_ANIM_WENDY_OLDBAG, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x28, 0x29, 0x2A, 0x2B }, .talkFlagId = { 0x3A, 0x3B, 0x3C, 0x3D }, @@ -439,7 +439,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0x7, .personId = PERSON_ANIM_WENDY_OLDBAG, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x2C, 0x2B, 0x2A, 0xFF }, .talkFlagId = { 0x3E, 0x3F, 0x40, 0xFF }, @@ -448,7 +448,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0x7, .personId = PERSON_ANIM_WENDY_OLDBAG, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x2C, 0x2B, 0x2A, 0x2D }, .talkFlagId = { 0x3E, 0x3F, 0x40, 0x41 }, @@ -457,7 +457,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0x7, .personId = PERSON_ANIM_WENDY_OLDBAG, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x2C, 0x2B, 0x2D, 0x2E }, .talkFlagId = { 0x3E, 0x3F, 0x41, 0x42 }, @@ -466,7 +466,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0xA, .personId = PERSON_ANIM_GUMSHOE, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x2F, 0x30, 0x27, 0xFF }, .talkFlagId = { 0x43, 0x44, 0x45, 0xFF }, @@ -475,7 +475,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0xA, .personId = PERSON_ANIM_GUMSHOE, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x2F, 0x30, 0x27, 0x31 }, .talkFlagId = { 0x43, 0x44, 0x45, 0x46 }, @@ -484,7 +484,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0xB, .personId = PERSON_ANIM_PENNY_NICHOLS, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x32, 0x29, 0xFF, 0xFF }, .talkFlagId = { 0x47, 0x48, 0xFF, 0xFF }, @@ -493,7 +493,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0xB, .personId = PERSON_ANIM_PENNY_NICHOLS, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x32, 0x29, 0x33, 0xFF }, .talkFlagId = { 0x47, 0x48, 0x49, 0xFF }, @@ -502,7 +502,7 @@ const struct TalkData gTalkData_2_0[17] = { { .roomId = 0xFF, .personId = 0xFF, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0xFF, .iconId = { 0xFF, 0xFF, 0xFF, 0xFF }, .talkFlagId = { 0xFF, 0xFF, 0xFF, 0xFF }, diff --git a/src/investigation_segment_2_2.c b/src/investigation_segment_2_2.c index ca050c1..d535d52 100644 --- a/src/investigation_segment_2_2.c +++ b/src/investigation_segment_2_2.c @@ -306,7 +306,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0x6, .personId = PERSON_ANIM_MAYA, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x20, 0x21, 0xFF, 0xFF }, .talkFlagId = { 0x4A, 0x4B, 0xFF, 0xFF }, @@ -315,7 +315,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0x6, .personId = PERSON_ANIM_SUMMONED_MIA, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x20, 0x21, 0xFF, 0xFF }, .talkFlagId = { 0x4C, 0x4D, 0xFF, 0xFF }, @@ -324,7 +324,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0x2, .personId = PERSON_ANIM_WILL_POWERS, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x34, 0x35, 0xFF, 0xFF }, .talkFlagId = { 0x4E, 0x4F, 0xFF, 0xFF }, @@ -333,7 +333,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0x7, .personId = PERSON_ANIM_PENNY_NICHOLS, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x28, 0x34, 0x36, 0xFF }, .talkFlagId = { 0x50, 0x51, 0x52, 0xFF }, @@ -342,7 +342,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0x7, .personId = PERSON_ANIM_WENDY_OLDBAG, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x34, 0x36, 0xFF, 0xFF }, .talkFlagId = { 0x53, 0x54, 0xFF, 0xFF }, @@ -351,7 +351,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0x7, .personId = PERSON_ANIM_WENDY_OLDBAG, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x34, 0x36, 0x46, 0xFF }, .talkFlagId = { 0x55, 0x56, 0x57, 0xFF }, @@ -360,7 +360,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0x8, .personId = PERSON_ANIM_CODY_HACKINS, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x37, 0x24, 0xFF, 0xFF }, .talkFlagId = { 0x58, 0x59, 0xFF, 0xFF }, @@ -369,7 +369,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0x8, .personId = PERSON_ANIM_CODY_HACKINS, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x24, 0x23, 0xFF, 0xFF }, .talkFlagId = { 0x59, 0x5A, 0xFF, 0xFF }, @@ -378,7 +378,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0x9, .personId = PERSON_ANIM_SAL_MANELLA, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x32, 0xFF, 0xFF, 0xFF }, .talkFlagId = { 0x5B, 0xFF, 0xFF, 0xFF }, @@ -387,7 +387,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0x9, .personId = PERSON_ANIM_SAL_MANELLA, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x32, 0x38, 0x39, 0xFF }, .talkFlagId = { 0x5B, 0x5C, 0x5D, 0xFF }, @@ -396,7 +396,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0x9, .personId = PERSON_ANIM_CODY_HACKINS, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x24, 0x23, 0xFF, 0xFF }, .talkFlagId = { 0x5E, 0x5F, 0xFF, 0xFF }, @@ -405,7 +405,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0x9, .personId = PERSON_ANIM_CODY_HACKINS, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x24, 0x23, 0xFF, 0xFF }, .talkFlagId = { 0x60, 0x62, 0xFF, 0xFF }, @@ -414,7 +414,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0x9, .personId = PERSON_ANIM_CODY_HACKINS, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x24, 0x23, 0x3A, 0xFF }, .talkFlagId = { 0x60, 0x62, 0x61, 0xFF }, @@ -423,7 +423,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0xD, .personId = PERSON_ANIM_DEE_VASQUEZ, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x32, 0x24, 0x35, 0xFF }, .talkFlagId = { 0x63, 0x64, 0x65, 0xFF }, @@ -432,7 +432,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0xD, .personId = PERSON_ANIM_DEE_VASQUEZ, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x32, 0x24, 0x35, 0x3B }, .talkFlagId = { 0x63, 0x64, 0x65, 0x66 }, @@ -441,7 +441,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0xD, .personId = PERSON_ANIM_PENNY_NICHOLS, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x34, 0x3C, 0xFF, 0xFF }, .talkFlagId = { 0x67, 0x68, 0xFF, 0xFF }, @@ -450,7 +450,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0xD, .personId = PERSON_ANIM_PENNY_NICHOLS, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x34, 0x3C, 0x47, 0xFF }, .talkFlagId = { 0x67, 0x68, 0x69, 0xFF }, @@ -459,7 +459,7 @@ const struct TalkData gTalkData_2_2[18] = { { .roomId = 0xFF, .personId = 0xFF, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0xFF, .iconId = { 0xFF, 0xFF, 0xFF, 0xFF }, .talkFlagId = { 0xFF, 0xFF, 0xFF, 0xFF }, diff --git a/src/investigation_segment_2_4.c b/src/investigation_segment_2_4.c index 536edae..9fc634c 100644 --- a/src/investigation_segment_2_4.c +++ b/src/investigation_segment_2_4.c @@ -193,7 +193,7 @@ const struct TalkData gTalkData_2_4[13] = { { .roomId = 0x6, .personId = PERSON_ANIM_MAYA, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x24, 0x3D, 0x21, 0xFF }, .talkFlagId = { 0x6A, 0x6B, 0x6C, 0xFF }, @@ -202,7 +202,7 @@ const struct TalkData gTalkData_2_4[13] = { { .roomId = 0x2, .personId = PERSON_ANIM_WILL_POWERS, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x3E, 0x3F, 0x3C, 0xFF }, .talkFlagId = { 0x6D, 0x6E, 0x6F, 0xFF }, @@ -211,7 +211,7 @@ const struct TalkData gTalkData_2_4[13] = { { .roomId = 0x7, .personId = PERSON_ANIM_WENDY_OLDBAG, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x3E, 0x3F, 0x3C, 0xFF }, .talkFlagId = { 0x70, 0x71, 0x72, 0xFF }, @@ -220,7 +220,7 @@ const struct TalkData gTalkData_2_4[13] = { { .roomId = 0x7, .personId = PERSON_ANIM_WENDY_OLDBAG, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x3E, 0x3F, 0x3C, 0x40 }, .talkFlagId = { 0x70, 0x71, 0x72, 0x7E }, @@ -229,7 +229,7 @@ const struct TalkData gTalkData_2_4[13] = { { .roomId = 0x8, .personId = PERSON_ANIM_GUMSHOE, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x41, 0x42, 0x43, 0xFF }, .talkFlagId = { 0x73, 0x74, 0x75, 0xFF }, @@ -238,7 +238,7 @@ const struct TalkData gTalkData_2_4[13] = { { .roomId = 0x8, .personId = PERSON_ANIM_GUMSHOE, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x42, 0x43, 0xFF, 0xFF }, .talkFlagId = { 0x74, 0x75, 0xFF, 0xFF }, @@ -247,7 +247,7 @@ const struct TalkData gTalkData_2_4[13] = { { .roomId = 0x9, .personId = PERSON_ANIM_PENNY_NICHOLS, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x3C, 0x44, 0xFF, 0xFF }, .talkFlagId = { 0x76, 0x78, 0xFF, 0xFF }, @@ -256,7 +256,7 @@ const struct TalkData gTalkData_2_4[13] = { { .roomId = 0x9, .personId = PERSON_ANIM_PENNY_NICHOLS, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x3C, 0x44, 0x45, 0xFF }, .talkFlagId = { 0x76, 0x78, 0x79, 0xFF }, @@ -265,7 +265,7 @@ const struct TalkData gTalkData_2_4[13] = { { .roomId = 0x9, .personId = PERSON_ANIM_PENNY_NICHOLS, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x3C, 0x44, 0x40, 0xFF }, .talkFlagId = { 0x76, 0x78, 0x7A, 0xFF }, @@ -274,7 +274,7 @@ const struct TalkData gTalkData_2_4[13] = { { .roomId = 0x9, .personId = PERSON_ANIM_PENNY_NICHOLS, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x3C, 0x44, 0x45, 0x40 }, .talkFlagId = { 0x76, 0x78, 0x79, 0x7A }, @@ -283,7 +283,7 @@ const struct TalkData gTalkData_2_4[13] = { { .roomId = 0x9, .personId = PERSON_ANIM_PENNY_NICHOLS, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x3C, 0x44, 0x45, 0x40 }, .talkFlagId = { 0x76, 0x78, 0x79, 0x77 }, @@ -292,7 +292,7 @@ const struct TalkData gTalkData_2_4[13] = { { .roomId = 0xC, .personId = PERSON_ANIM_DEE_VASQUEZ, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x3C, 0x29, 0x3F, 0xFF }, .talkFlagId = { 0x7B, 0x7C, 0x7D, 0xFF }, @@ -301,7 +301,7 @@ const struct TalkData gTalkData_2_4[13] = { { .roomId = 0xFF, .personId = 0xFF, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0xFF, .iconId = { 0xFF, 0xFF, 0xFF, 0xFF }, .talkFlagId = { 0xFF, 0xFF, 0xFF, 0xFF }, diff --git a/src/investigation_segment_3_0.c b/src/investigation_segment_3_0.c index 6709a38..c11832a 100644 --- a/src/investigation_segment_3_0.c +++ b/src/investigation_segment_3_0.c @@ -484,7 +484,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x6, .personId = PERSON_ANIM_MAYA, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x48, 0x49, 0xFF, 0xFF }, .talkFlagId = { 0x7F, 0x80, 0xFF, 0xFF }, @@ -493,7 +493,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x6, .personId = PERSON_ANIM_MAYA, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x48, 0x49, 0xFF, 0xFF }, .talkFlagId = { 0x81, 0x82, 0xFF, 0xFF }, @@ -502,7 +502,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x2, .personId = PERSON_ANIM_EDGEWORTH, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x4A, 0x4B, 0xFF, 0xFF }, .talkFlagId = { 0x83, 0x84, 0xFF, 0xFF }, @@ -511,7 +511,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x2, .personId = PERSON_ANIM_EDGEWORTH, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x4A, 0x4B, 0x4C, 0xFF }, .talkFlagId = { 0x83, 0x84, 0x85, 0xFF }, @@ -520,7 +520,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x2, .personId = PERSON_ANIM_EDGEWORTH, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x4A, 0x4B, 0xFF, 0xFF }, .talkFlagId = { 0x86, 0x87, 0xFF, 0xFF }, @@ -529,7 +529,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x2, .personId = PERSON_ANIM_EDGEWORTH, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x4D, 0xFF, 0xFF, 0xFF }, .talkFlagId = { 0x88, 0xFF, 0xFF, 0xFF }, @@ -538,7 +538,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x2, .personId = PERSON_ANIM_EDGEWORTH, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x4D, 0x4E, 0x4F, 0xFF }, .talkFlagId = { 0x88, 0x89, 0x8A, 0xFF }, @@ -547,7 +547,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x10, .personId = PERSON_ANIM_GUMSHOE, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x4A, 0x50, 0x51, 0xFF }, .talkFlagId = { 0x8B, 0x8C, 0x8D, 0xFF }, @@ -556,7 +556,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x10, .personId = PERSON_ANIM_GUMSHOE, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x4A, 0x50, 0x51, 0x52 }, .talkFlagId = { 0x8B, 0x8C, 0x8D, 0x8E }, @@ -565,7 +565,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x11, .personId = PERSON_ANIM_LARRY_BUTZ, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x4A, 0x53, 0xFF, 0xFF }, .talkFlagId = { 0x8F, 0x90, 0xFF, 0xFF }, @@ -574,7 +574,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x11, .personId = PERSON_ANIM_LARRY_BUTZ, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x4A, 0x53, 0x50, 0xFF }, .talkFlagId = { 0x8F, 0x90, 0x91, 0xFF }, @@ -583,7 +583,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x11, .personId = PERSON_ANIM_LARRY_BUTZ, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x4A, 0x53, 0x54, 0xFF }, .talkFlagId = { 0x8F, 0x90, 0x92, 0xFF }, @@ -592,7 +592,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x11, .personId = PERSON_ANIM_LARRY_BUTZ, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x4A, 0x53, 0x50, 0x54 }, .talkFlagId = { 0x8F, 0x90, 0x91, 0x92 }, @@ -601,7 +601,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x12, .personId = PERSON_ANIM_LOTTA_HART, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x4A, 0x55, 0xFF, 0xFF }, .talkFlagId = { 0x93, 0x94, 0xFF, 0xFF }, @@ -610,7 +610,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x12, .personId = PERSON_ANIM_LOTTA_HART, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x4A, 0x56, 0xFF, 0xFF }, .talkFlagId = { 0x95, 0x97, 0xFF, 0xFF }, @@ -619,7 +619,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x12, .personId = PERSON_ANIM_LOTTA_HART, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x4A, 0x56, 0x57, 0xFF }, .talkFlagId = { 0x95, 0x97, 0x96, 0xFF }, @@ -628,7 +628,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0xE, .personId = PERSON_ANIM_GUMSHOE, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x58, 0x59, 0xFF, 0xFF }, .talkFlagId = { 0x98, 0x99, 0xFF, 0xFF }, @@ -637,7 +637,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0xE, .personId = PERSON_ANIM_GUMSHOE, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x58, 0x59, 0x5A, 0xFF }, .talkFlagId = { 0x98, 0x99, 0x9A, 0xFF }, @@ -646,7 +646,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0xE, .personId = PERSON_ANIM_GUMSHOE, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x58, 0x59, 0x5A, 0x5B }, .talkFlagId = { 0x98, 0x99, 0x9A, 0x9B }, @@ -655,7 +655,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0xE, .personId = PERSON_ANIM_GUMSHOE, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x5C, 0x5D, 0x50, 0xFF }, .talkFlagId = { 0xA0, 0xA1, 0xA2, 0xFF }, @@ -664,7 +664,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x3, .personId = PERSON_ANIM_MARVIN_GROSSBERG, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x4A, 0x5E, 0xFF, 0xFF }, .talkFlagId = { 0x9C, 0x9D, 0xFF, 0xFF }, @@ -673,7 +673,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x3, .personId = PERSON_ANIM_MARVIN_GROSSBERG, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x4A, 0x5E, 0x5F, 0xFF }, .talkFlagId = { 0x9C, 0x9D, 0x9E, 0xFF }, @@ -682,7 +682,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0x3, .personId = PERSON_ANIM_MARVIN_GROSSBERG, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x4A, 0x5E, 0x5F, 0x4D }, .talkFlagId = { 0x9C, 0x9D, 0x9E, 0x9F }, @@ -691,7 +691,7 @@ const struct TalkData gTalkData_3_0[24] = { { .roomId = 0xFF, .personId = 0xFF, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0xFF, .iconId = { 0xFF, 0xFF, 0xFF, 0xFF }, .talkFlagId = { 0xFF, 0xFF, 0xFF, 0xFF }, diff --git a/src/investigation_segment_3_2.c b/src/investigation_segment_3_2.c index bb5eddb..3a2b8a9 100644 --- a/src/investigation_segment_3_2.c +++ b/src/investigation_segment_3_2.c @@ -377,7 +377,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0x6, .personId = PERSON_ANIM_MAYA, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x48, 0x49, 0xFF, 0xFF }, .talkFlagId = { 0xA5, 0xA6, 0xFF, 0xFF }, @@ -386,7 +386,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0x2, .personId = PERSON_ANIM_MAYA, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x61, 0x62, 0xFF, 0xFF }, .talkFlagId = { 0xA3, 0xA4, 0xFF, 0xFF }, @@ -395,7 +395,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0x2, .personId = PERSON_ANIM_MAYA, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x48, 0x49, 0xFF, 0xFF }, .talkFlagId = { 0xA7, 0xA8, 0xFF, 0xFF }, @@ -404,7 +404,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0x10, .personId = PERSON_ANIM_LOTTA_HART, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x63, 0x54, 0x64, 0xFF }, .talkFlagId = { 0xA9, 0xAA, 0xAB, 0xFF }, @@ -413,7 +413,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0x11, .personId = PERSON_ANIM_LARRY_BUTZ, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x50, 0x65, 0xFF, 0xFF }, .talkFlagId = { 0xAC, 0xAD, 0xFF, 0xFF }, @@ -422,7 +422,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0x11, .personId = PERSON_ANIM_LARRY_BUTZ, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x50, 0x65, 0x66, 0xFF }, .talkFlagId = { 0xAC, 0xAD, 0xAE, 0xFF }, @@ -431,7 +431,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0x12, .personId = PERSON_ANIM_GUMSHOE, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x5D, 0x67, 0x68, 0xFF }, .talkFlagId = { 0xAF, 0xB0, 0xB1, 0xFF }, @@ -440,7 +440,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0x12, .personId = PERSON_ANIM_LOTTA_HART, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x4A, 0x54, 0xFF, 0xFF }, .talkFlagId = { 0xB3, 0xB2, 0xFF, 0xFF }, @@ -449,7 +449,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0x12, .personId = PERSON_ANIM_LOTTA_HART, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x4A, 0x69, 0xFF, 0xFF }, .talkFlagId = { 0xB3, 0xB4, 0xFF, 0xFF }, @@ -458,7 +458,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0x14, .personId = PERSON_ANIM_YANNI_YOGI, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x6D, 0x6E, 0xFF, 0xFF }, .talkFlagId = { 0xB5, 0xB6, 0xFF, 0xFF }, @@ -467,7 +467,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0x14, .personId = PERSON_ANIM_YANNI_YOGI, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x6D, 0x6E, 0x6F, 0xFF }, .talkFlagId = { 0xB5, 0xB6, 0xB7, 0xFF }, @@ -476,7 +476,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0x14, .personId = PERSON_ANIM_YANNI_YOGI, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x6D, 0x6E, 0x70, 0xFF }, .talkFlagId = { 0xB5, 0xB6, 0xB8, 0xFF }, @@ -485,7 +485,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0x14, .personId = PERSON_ANIM_YANNI_YOGI, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x6D, 0x6E, 0x6F, 0x70 }, .talkFlagId = { 0xB5, 0xB6, 0xB7, 0xB8 }, @@ -494,7 +494,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0xE, .personId = PERSON_ANIM_GUMSHOE, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x6A, 0x54, 0xFF, 0xFF }, .talkFlagId = { 0xB9, 0xBA, 0xFF, 0xFF }, @@ -503,7 +503,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0xE, .personId = PERSON_ANIM_GUMSHOE, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x6A, 0x6B, 0xFF, 0xFF }, .talkFlagId = { 0xB9, 0xBB, 0xFF, 0xFF }, @@ -512,7 +512,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0xE, .personId = PERSON_ANIM_GUMSHOE, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x6C, 0x4D, 0xFF, 0xFF }, .talkFlagId = { 0xBC, 0xBD, 0xFF, 0xFF }, @@ -521,7 +521,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0xF, .personId = PERSON_ANIM_MAYA, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x71, 0x72, 0x73, 0xFF }, .talkFlagId = { 0xBE, 0xBF, 0xC0, 0xFF }, @@ -530,7 +530,7 @@ const struct TalkData gTalkData_3_2[18] = { { .roomId = 0xFF, .personId = 0xFF, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0xFF, .iconId = { 0xFF, 0xFF, 0xFF, 0xFF }, .talkFlagId = { 0xFF, 0xFF, 0xFF, 0xFF }, diff --git a/src/investigation_segment_3_4.c b/src/investigation_segment_3_4.c index e4cfe7a..7f453c5 100644 --- a/src/investigation_segment_3_4.c +++ b/src/investigation_segment_3_4.c @@ -122,7 +122,7 @@ const struct TalkData gTalkData_3_4[12] = { { .roomId = 0x6, .personId = PERSON_ANIM_LARRY_BUTZ, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x63, 0x50, 0xFF, 0xFF }, .talkFlagId = { 0xC1, 0xC2, 0xFF, 0xFF }, @@ -131,7 +131,7 @@ const struct TalkData gTalkData_3_4[12] = { { .roomId = 0x6, .personId = PERSON_ANIM_LARRY_BUTZ, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x63, 0x50, 0x74, 0xFF }, .talkFlagId = { 0xC1, 0xC2, 0xC3, 0xFF }, @@ -140,7 +140,7 @@ const struct TalkData gTalkData_3_4[12] = { { .roomId = 0x6, .personId = PERSON_ANIM_LARRY_BUTZ, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x63, 0x50, 0x74, 0x75 }, .talkFlagId = { 0xC1, 0xC2, 0xC3, 0xC4 }, @@ -149,7 +149,7 @@ const struct TalkData gTalkData_3_4[12] = { { .roomId = 0x6, .personId = PERSON_ANIM_MAYA, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x48, 0x49, 0xFF, 0xFF }, .talkFlagId = { 0xC5, 0xC6, 0xFF, 0xFF }, @@ -158,7 +158,7 @@ const struct TalkData gTalkData_3_4[12] = { { .roomId = 0x2, .personId = PERSON_ANIM_EDGEWORTH, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x76, 0x77, 0xFF, 0xFF }, .talkFlagId = { 0xC7, 0xC8, 0xFF, 0xFF }, @@ -167,7 +167,7 @@ const struct TalkData gTalkData_3_4[12] = { { .roomId = 0x2, .personId = PERSON_ANIM_EDGEWORTH, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x76, 0x77, 0x78, 0xFF }, .talkFlagId = { 0xC7, 0xC8, 0xC9, 0xFF }, @@ -176,7 +176,7 @@ const struct TalkData gTalkData_3_4[12] = { { .roomId = 0x2, .personId = PERSON_ANIM_EDGEWORTH, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x76, 0x77, 0x78, 0x79 }, .talkFlagId = { 0xC7, 0xC8, 0xC9, 0xCA }, @@ -185,7 +185,7 @@ const struct TalkData gTalkData_3_4[12] = { { .roomId = 0xF, .personId = PERSON_ANIM_MANFRED_VONKARMA, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x50, 0x5D, 0xFF, 0xFF }, .talkFlagId = { 0xCB, 0xCC, 0xFF, 0xFF }, @@ -194,7 +194,7 @@ const struct TalkData gTalkData_3_4[12] = { { .roomId = 0x3, .personId = PERSON_ANIM_MARVIN_GROSSBERG, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x1, .iconId = { 0x7A, 0x7B, 0xFF, 0xFF }, .talkFlagId = { 0xCD, 0xCE, 0xFF, 0xFF }, @@ -203,7 +203,7 @@ const struct TalkData gTalkData_3_4[12] = { { .roomId = 0x3, .personId = PERSON_ANIM_MARVIN_GROSSBERG, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x7A, 0x7B, 0x77, 0xFF }, .talkFlagId = { 0xCD, 0xCE, 0xCF, 0xFF }, @@ -212,7 +212,7 @@ const struct TalkData gTalkData_3_4[12] = { { .roomId = 0x3, .personId = PERSON_ANIM_MARVIN_GROSSBERG, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0x0, .iconId = { 0x7A, 0x7B, 0x77, 0x7C }, .talkFlagId = { 0xCD, 0xCE, 0xCF, 0xD0 }, @@ -221,7 +221,7 @@ const struct TalkData gTalkData_3_4[12] = { { .roomId = 0xFF, .personId = 0xFF, - .unk2 = 0xFF, + .filler2 = 0xFF, .enableFlag = 0xFF, .iconId = { 0xFF, 0xFF, 0xFF, 0xFF }, .talkFlagId = { 0xFF, 0xFF, 0xFF, 0xFF }, diff --git a/src/script_commands3.c b/src/script_commands3.c index 615d89c..48e7766 100644 --- a/src/script_commands3.c +++ b/src/script_commands3.c @@ -140,7 +140,7 @@ bool32 Command46(struct ScriptContext * scriptCtx) } } r6 += 32 + 20*30*2; - DmaCopy16(3, r6, eUnknown_02031FC0, 30*20*TILE_SIZE_4BPP); + DmaCopy16(3, r6, eVRAMScratchpadBuffer, 30*20*TILE_SIZE_4BPP); gIORegisters.lcd_dispcnt |= DISPCNT_BG2_ON; gIORegisters.lcd_bg2cnt = BGCNT_PRIORITY(2) | BGCNT_CHARBASE(2) | BGCNT_SCREENBASE(30) | BGCNT_16COLOR | BGCNT_WRAP; scriptCtx->flags |= 0x40; From 8154e323522284c1cfbfbe5a1450040b8a7bf630 Mon Sep 17 00:00:00 2001 From: Missingmew Date: Thu, 27 Jun 2024 00:12:39 +0200 Subject: [PATCH 17/17] should be no unk members left --- include/background.h | 2 +- include/court.h | 2 +- include/court_record.h | 2 +- include/ewram.h | 2 +- include/main.h | 8 ++++---- include/script.h | 10 +++++----- src/animation.c | 2 +- src/bg.c | 12 ++++++------ src/court.c | 4 ++-- src/court_record.c | 2 +- src/save_processes.c | 2 +- src/script_commands2.c | 16 ++++++++-------- src/script_main.c | 2 +- src/title_processes.c | 2 +- src/utils.c | 16 ++++++++-------- 15 files changed, 42 insertions(+), 42 deletions(-) diff --git a/include/background.h b/include/background.h index 5b4b54d..1ee700b 100644 --- a/include/background.h +++ b/include/background.h @@ -49,7 +49,7 @@ struct CourtScroll /* +0x00 */ u8 * frameDataPtr; /* +0x04 */ u16 state; /* +0x06 */ u8 scrollMode; - /* +0x07 */ u8 unk7; // padding + /* +0x07 */ u8 filler7; // padding /* +0x08 */ u16 scrollingPersonAnimId; /* +0x0A */ u16 animOffset; /* +0x0C */ s16 frameCounter; diff --git a/include/court.h b/include/court.h index d3cbd83..ae90bb1 100644 --- a/include/court.h +++ b/include/court.h @@ -12,7 +12,7 @@ struct TestimonyStruct /* +0x03 */ u8 presentPromptY; // unity AA4: pos_y_tukitukeru /* +0x04 */ u16 healthPointX; // unity AA4: pos_x_rest /* +0x06 */ u8 testimonyAnimMoveAmount; // unity AA4: add - /* +0x07 */ u8 unk7; // unity AA4: dm00 filler dummy + /* +0x07 */ u8 filler7; // unity AA4: dm00 filler dummy }; extern struct TestimonyStruct gTestimony; diff --git a/include/court_record.h b/include/court_record.h index adf62bf..619e52b 100644 --- a/include/court_record.h +++ b/include/court_record.h @@ -14,7 +14,7 @@ struct CourtRecord /* +0x08 */ u8 recordArrowFrame; // unity AA4: arrow_type /* +0x09 */ u8 recordArrowCounter; // unity AA4: arrow_timer /* +0x0A */ bool8 windowIsSaveScreen; // unity AA4: win_flag - /* +0x0B */ u8 unkB; // unity AA4: win_type // unused + /* +0x0B */ u8 fillerB; // unity AA4: win_type // unused /* +0x0C */ u8 flags; // unity AA4: page_status /* +0x0D */ u8 selectedItem; // unity AA4: page_now /* +0x0E */ u8 displayItemCount; // unity AA4: page_now_max diff --git a/include/ewram.h b/include/ewram.h index b882bd8..a1864ee 100644 --- a/include/ewram.h +++ b/include/ewram.h @@ -4,6 +4,6 @@ #define eGeneralScratchpadBuffer ((void *)EWRAM_START+0xAFC0) #define eScriptHeap ((void*) (EWRAM_START + 0x11FC0)) #define eBGDecompBuffer ((void*) (EWRAM_START + 0x2CFC0)) -#define eVRAMScratchpadBuffer ((void*) (EWRAM_START + 0x31FC0)) // only used in Command46, the data never gets accessed elsewhere +#define eVRAMScratchpadBuffer ((void*) (EWRAM_START + 0x31FC0)) #endif//GUARD_EWRAM_H diff --git a/include/main.h b/include/main.h index 320d9b9..178d635 100644 --- a/include/main.h +++ b/include/main.h @@ -47,14 +47,14 @@ struct Main /* +0x028 */ u16 currentBG; // BG related code not in GlobalWork struct, this might be another struct on its own but i'm not sure /* +0x02A */ s16 previousBG; // probably wrong /* +0x02C */ s8 currentBgStripe; // maybe Bg256_rno_0? - /* +0x02D */ u8 unk2D; // unused field maybe Bg256_SP_Flag? + /* +0x02D */ u8 filler2D; // unused field maybe Bg256_SP_Flag? is disableDetentionCenterMaskInDetentionCenter in pwaa2 /* +0x02E */ bool8 isBGScrolling; // unity AA4: Bg256_scroll_flag /* +0x02F */ u8 Bg256_stop_line; // unity AA4: Bg256_stop_line /* +0x030 */ s16 Bg256_scroll_x; // unity AA4: Bg256_scroll_x /* +0x032 */ s16 Bg256_scroll_y; // unity AA4: Bg256_scroll_y /* +0x034 */ s16 Bg256_pos_x; // unity AA4: Bg256_pos_x /* +0x036 */ s16 Bg256_pos_y; // unity AA4: Bg256_pos_y - /* +0x038 */ u16 unk38; // unity AA4: Bg256_add? unused but is background related 100% + /* +0x038 */ u16 unused38; // unity AA4: Bg256_add? unused but is background related 100% /* +0x03A */ s16 Bg256_dir; // unity AA4: Bg256_dir /* +0x03C */ s8 horizontolBGScrollSpeed; // unity AA4: Bg256_scroll_speed_x /* +0x03D */ s8 verticalBGScrollSpeed; // unity AA4: Bg256_scroll_speed_y @@ -80,7 +80,7 @@ struct Main /* +0x088 */ u8 damageFrame; // unity: Rest_type /* +0x089 */ u8 damageFrameTimer; // unity: Rest_timer /* +0x08A */ u8 previousHealth; // unity: rest_old - /* +0x08B */ u8 unk8B; // unused + /* +0x08B */ u8 filler8B; // unused /* +0x08C */ u8 currentRoomId; // unity: Room? uint in unity /* +0x08D */ u8 scenarioIdx; // unity: scenario, actually the script you're running /* +0x08E */ u8 caseEnabledFlags; // unity: Scenario_enable, whetever a case is enabled or not, unity names suck @@ -92,7 +92,7 @@ struct Main /* +0x0B8 */ u32 talkEndFlags[8]; // unity: talk_end_flag /* +0x0D8 */ u8 roomData[24][8]; // unity: Map_data //TODO: first size might be wrong /* +0x198 */ u32 soundFlags; - /* +0x19C */ u32 unk19C; // bit 2 is set, never used + /* +0x19C */ u32 unused19C; // bit 2 is set, never used }; struct IORegisters diff --git a/include/script.h b/include/script.h index c0832aa..2edd2e1 100644 --- a/include/script.h +++ b/include/script.h @@ -22,7 +22,7 @@ struct ScriptContext /* +0x12 */ u8 fullscreenTextX; /* +0x13 */ u8 textSkip; /* +0x14 */ u8 paragraphSkipDelayCounter; // unity AA4: speed_timer? - /* +0x15 */ u8 unk15; // unity AA4: speed_time? // set once never used + /* +0x15 */ u8 unused15; // unity AA4: speed_time? // set once never used /* +0x16 */ u8 soundCueSkip; // unity AA4: moji_cnt /* +0x17 */ u8 currentSoundCue; // unity AA4: moji_se /* +0x18 */ s16 textXOffset; // unity AA4: plate_pos_x @@ -39,9 +39,9 @@ struct ScriptContext /* +0x2A */ u16 fullscreenTextYOffset; // unity: AA4: sel_pos_y /* +0x2C */ u16 holdItSection; // unity AA4: tukkomi_no /* +0x2E */ u8 holdItFlag; // unity AA4: tukkomi_flag - /* +0x2F */ u8 unk2F; // unity AA4: moji? // unused - /* +0x30 */ u8 unk30; // unity AA4: houtei_page? // unused - /* +0x31 */ u8 unk31; // unity AA4: plate_set_flag? // unused + /* +0x2F */ u8 filler2F; // unity AA4: moji? // unused + /* +0x30 */ u8 filler30; // unity AA4: houtei_page? // unused + /* +0x31 */ u8 filler31; // unity AA4: plate_set_flag? // unused /* +0x32 */ u8 personAnimPauseCounter; // unity: rt_wait_timer /* +0x33 */ bool8 slamDesk; // unity: desk_attack /* +0x34 */ u8 textboxNameId; // unity: speaker_id @@ -50,7 +50,7 @@ struct ScriptContext /* +0x37 */ u8 textboxDownArrowDelayCounter; // unity AA4: enter_type_timer /* +0x38 */ u8 textboxState; // unity: mess_win_rno /* +0x39 */ u8 fullscreenCursorPos; // unity AA4: cursol - /* +0x3A */ u8 unk3A; // unity AA4: add_y, used but does nothing + /* +0x3A */ u8 unused3A; // unity AA4: add_y, used but has no effect where its used /* +0x3B */ u8 textboxYPos; // unity AA4: frame_y /* +0x3C */ u8 * mapMarkerVramPtr; // unity AA4: Expl_now_vram_addr? }; diff --git a/src/animation.c b/src/animation.c index 51424a2..ba1d781 100644 --- a/src/animation.c +++ b/src/animation.c @@ -1472,7 +1472,7 @@ struct AnimationListEntry *PlayPersonAnimationAtCustomOrigin(u32 arg0, u32 talki return NULL; } animationInfo.animId = 0xFF; - *(u16 *)(&animationInfo.personId) = arg0; // this assignment matches but sucks. doing it like this allows unk2 to not be an array which makes everything else more sane + *(u16 *)(&animationInfo.personId) = arg0; // this assignment matches but sucks. doing it like this allows animationInfo to not be an array which makes everything else more sane animationInfo.vramPtr = OBJ_VRAM0 + 0x5800; animationInfo.animGfxDataStartPtr = gPersonAnimData[personId].gfxData; animationInfo.animFrameDataStartPtr = gPersonAnimData[personId].frameData + talkingAnimOff; diff --git a/src/bg.c b/src/bg.c index 72224cc..d504676 100644 --- a/src/bg.c +++ b/src/bg.c @@ -203,12 +203,12 @@ const u16 gMapSpeedlines[0x2C0] = { }; -void SetTextboxSize(u32 unk0) +void SetTextboxSize(u32 arg0) { struct ScriptContext * scriptCtx = &gScriptContext; u16 * map; u32 i; - switch(unk0) + switch(arg0) { case 0: map = gBG1MapBuffer; @@ -220,7 +220,7 @@ void SetTextboxSize(u32 unk0) SetTextboxNametag(scriptCtx->textboxNameId & 0x7F, (u8)(scriptCtx->textboxNameId & 0x80)); break; case 1: - scriptCtx->unk3A = 0; + scriptCtx->unused3A = 0; scriptCtx->textboxYPos = 14; scriptCtx->textboxState = 2; SetTextboxNametag(0, FALSE); @@ -259,10 +259,10 @@ void UpdateTextbox() case 1: break; case 2: - scriptCtx->unk3A += 2; - if(scriptCtx->unk3A < 2) + scriptCtx->unused3A += 2; + if(scriptCtx->unused3A < 2) break; - scriptCtx->unk3A = 0; + scriptCtx->unused3A = 0; tiley = scriptCtx->textboxYPos * 32; for(i = 0; i < 32; i++) { diff --git a/src/court.c b/src/court.c index 710e9ef..6984159 100644 --- a/src/court.c +++ b/src/court.c @@ -765,11 +765,11 @@ void VerdictProcess(struct Main * main) } } -void UpdateQuestioningMenuSprites(struct Main * main, struct TestimonyStruct * testimony, u32 unk2) // questioning_menu_disp +void UpdateQuestioningMenuSprites(struct Main * main, struct TestimonyStruct * testimony, u32 arg2) // questioning_menu_disp { u32 i; struct OamAttrs * oam; - if(gScriptContext.holdItSection == 0 || unk2 == 0) + if(gScriptContext.holdItSection == 0 || arg2 == 0) { oam = &gOamObjects[OAM_IDX_BUTTON_PROMPTS]; oam->attr0 = SPRITE_ATTR0_CLEAR; diff --git a/src/court_record.c b/src/court_record.c index 2a65b69..9320fab 100644 --- a/src/court_record.c +++ b/src/court_record.c @@ -1125,7 +1125,7 @@ void CourtRecordDetailSubMenu(struct Main * main, struct CourtRecord * courtReco main->Bg256_scroll_y = gSaveDataBuffer.main.Bg256_scroll_y; main->Bg256_pos_x = gSaveDataBuffer.main.Bg256_pos_x; main->Bg256_pos_y = gSaveDataBuffer.main.Bg256_pos_y; - main->unk38 = gSaveDataBuffer.main.unk38; + main->unused38 = gSaveDataBuffer.main.unused38; main->Bg256_dir = gSaveDataBuffer.main.Bg256_dir; main->horizontolBGScrollSpeed = gSaveDataBuffer.main.horizontolBGScrollSpeed; main->verticalBGScrollSpeed = gSaveDataBuffer.main.verticalBGScrollSpeed; diff --git a/src/save_processes.c b/src/save_processes.c index f3e96cb..41cd061 100644 --- a/src/save_processes.c +++ b/src/save_processes.c @@ -429,7 +429,7 @@ void SaveGameExitSaveScreen(struct Main *main) main->Bg256_scroll_y = gSaveDataBuffer.main.Bg256_scroll_y; main->Bg256_pos_x = gSaveDataBuffer.main.Bg256_pos_x; main->Bg256_pos_y = gSaveDataBuffer.main.Bg256_pos_y; - main->unk38 = gSaveDataBuffer.main.unk38; + main->unused38 = gSaveDataBuffer.main.unused38; main->Bg256_dir = gSaveDataBuffer.main.Bg256_dir; main->horizontolBGScrollSpeed = gSaveDataBuffer.main.horizontolBGScrollSpeed; main->verticalBGScrollSpeed = gSaveDataBuffer.main.verticalBGScrollSpeed; diff --git a/src/script_commands2.c b/src/script_commands2.c index 01a6c4c..770cf1d 100644 --- a/src/script_commands2.c +++ b/src/script_commands2.c @@ -30,7 +30,7 @@ struct SpotSelectData /* +0x20 */ u16 firstAreaSection; /* +0x22 */ u16 secondAreaSection; /* +0x24 */ u16 defaultSection; - /* +0x26 */ u16 unk26; // Unused, called a dummy in unity + /* +0x26 */ u16 filler26; // Unused, called a dummy in unity /* +0x28 */ u8 left; /* +0x29 */ u8 top; /* +0x2A */ u8 right; @@ -179,7 +179,7 @@ static const struct SpotSelectData gSpotSelectData[] = { .firstAreaSection = 0xA3, .secondAreaSection = 0xA2, .defaultSection = 0xA1, - .unk26 = 0, + .filler26 = 0, .left = 26, .top = 4, .right = 188, @@ -223,7 +223,7 @@ static const struct SpotSelectData gSpotSelectData[] = { .firstAreaSection = 0xE9, .secondAreaSection = 0xE8, .defaultSection = 0xE7, - .unk26 = 0, + .filler26 = 0, .left = 2, .top = 2, .right = 222, @@ -267,7 +267,7 @@ static const struct SpotSelectData gSpotSelectData[] = { .firstAreaSection = 0xEC, .secondAreaSection = 0xEB, .defaultSection = 0xEB, - .unk26 = 0, + .filler26 = 0, .left = 2, .top = 2, .right = 222, @@ -311,7 +311,7 @@ static const struct SpotSelectData gSpotSelectData[] = { .firstAreaSection = 0xEF, .secondAreaSection = 0xEC, .defaultSection = 0xED, - .unk26 = 0, + .filler26 = 0, .left = 2, .top = 2, .right = 222, @@ -355,7 +355,7 @@ static const struct SpotSelectData gSpotSelectData[] = { .firstAreaSection = 0xDD, .secondAreaSection = 0xDB, .defaultSection = 0xDC, - .unk26 = 0, + .filler26 = 0, .left = 2, .top = 2, .right = 222, @@ -399,7 +399,7 @@ static const struct SpotSelectData gSpotSelectData[] = { .firstAreaSection = 0xD8, .secondAreaSection = 0xD6, .defaultSection = 0xD7, - .unk26 = 0, + .filler26 = 0, .left = 2, .top = 2, .right = 222, @@ -443,7 +443,7 @@ static const struct SpotSelectData gSpotSelectData[] = { .firstAreaSection = 0xC4, .secondAreaSection = 0xC2, .defaultSection = 0xC3, - .unk26 = 0, + .filler26 = 0, .left = 2, .top = 2, .right = 222, diff --git a/src/script_main.c b/src/script_main.c index 4883707..087b3f9 100644 --- a/src/script_main.c +++ b/src/script_main.c @@ -175,7 +175,7 @@ void InitScriptSection(struct ScriptContext *scriptCtx) scriptCtx->textY = 0; if (!(gMain.process[GAME_PROCESS] == INVESTIGATION_PROCESS && gMain.process[GAME_PROCESS_STATE] == INVESTIGATION_TALK)) scriptCtx->textSkip = 0; - scriptCtx->unk15 = 0; + scriptCtx->unused15 = 0; scriptCtx->paragraphSkipDelayCounter = 8; scriptCtx->soundCueSkip = 1; scriptCtx->currentSoundCue = 0; diff --git a/src/title_processes.c b/src/title_processes.c index 1e780db..227ee1c 100644 --- a/src/title_processes.c +++ b/src/title_processes.c @@ -95,7 +95,7 @@ void TitleScreenProcess(struct Main *main) gInvestigation.pointerFrameCounter = 0; gInvestigation.pointerFrame = 2; main->selectedButton = 0; - main->unk19C |= 4; + main->unused19C |= 4; main->tilemapUpdateBits = 9; StartHardwareBlend(1, 1, 1, 0x1F); SET_PROCESS_PTR(TITLE_SCREEN_PROCESS, 2, 0, 0, main); diff --git a/src/utils.c b/src/utils.c index 5eca8ac..9f00ff4 100644 --- a/src/utils.c +++ b/src/utils.c @@ -417,14 +417,14 @@ union s32asBitfields u8 Random() { struct Main * main = &gMain; - union s32asBitfields unk0; - union s32asBitfields unk1; - unk0.shorts.low = (s16)main->rngSeed; - unk1.shorts.low = (s16)main->rngSeed * 3; - unk0.bytes.low += (u8)unk1.bytes.high; - unk0.bytes.high = unk1.bytes.high; - main->rngSeed = unk0.w; - return unk0.w; + union s32asBitfields val0; + union s32asBitfields val1; + val0.shorts.low = (s16)main->rngSeed; + val1.shorts.low = (s16)main->rngSeed * 3; + val0.bytes.low += (u8)val1.bytes.high; + val0.bytes.high = val1.bytes.high; + main->rngSeed = val0.w; + return val0.w; } u32 * gFlagPtrs[] = {