Also misc work

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

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

include/background.h

@@ -42,14 +42,14 @@ 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
 {
     /* +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;

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;

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

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 eVRAMScratchpadBuffer ((void*) (EWRAM_START + 0x31FC0))
 
-#endif//GUARD_EWRAM_H
+#endif//GUARD_EWRAM_H

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];

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