fragment50

include/functions.h

@@ -3,8 +3,6 @@
 
 #include "ultra64.h"
 
-f32 __sinf(f32);
-
 void func_80057FD0(void *, int);
 s32 func_8005A990(OSPiHandle *);
 
@@ -42,4 +40,7 @@ long long __ll_rshift(long long a0, long long a1);
 
 f32 abs_asm(f32);
 
+f32 __cosf(f32);
+f32 __sinf(f32);
+
 #endif

include/sections.h

@@ -526,6 +526,8 @@ extern u8 gb_pak_select_ui_ROM_START[];            // 6B4F00
 extern u8 gb_pak_select_ui_ROM_END[];              // 6B4F00
 extern u8 run_rattata_run_flag_gfx_ROM_START[];
 extern u8 run_rattata_run_flag_gfx_ROM_END[];
+extern u8 victory_palace_plate_text_ROM_START[];
+extern u8 victory_palace_plate_text_ROM_END[];
 extern u8 kanto_gb_map_ROM_START[];
 extern u8 kanto_gb_map_ROM_END[];
 extern u8 battle_ui_ROM_START[];

include/variables.h

@@ -506,6 +506,7 @@ extern u8 D_200A300[];
 extern u8 D_200A780[];
 extern u8 D_2000980[];
 extern u8 D_2000A60[];
+extern u8 D_3008200[];
 
 extern LEODiskID D_800818E0;
 
@@ -524,6 +525,8 @@ extern u8 D_86C00000;
 extern u8 D_87A00000;
 extern u8 D_87000000[];
 
+extern u8 D_800AF770[];
+
 typedef struct unk_D_800A7440 {
 	/* 0x00 */ s16 x1;
 	/* 0x02 */ s16 y1;

linker_scripts/us/symbol_addrs.txt

@@ -750,4 +750,11 @@ D_20007C0 = 0x20007C0;
 D_20008A0 = 0x20008A0;
 D_838067F0 = 0x838067F0; // size:0x1D088
 D_2000980 = 0x2000980;
-D_2000A60 = 0x2000A60;
+D_2000A60 = 0x2000A60;
+D_82607B60 = 0x82607B60; // size:0x708
+D_82608268 = 0x82608268; // size:0x168
+D_826083D0 = 0x826083D0; // size:0x168
+D_82607420 = 0x82607420; // size:0x730
+D_82608568 = 0x82608568; // size:0x75F80
+D_3008200 = 0x3008200;
+D_8267E4F8 = 0x8267E4F8; // size:0x258

linker_scripts/us/undefined_syms.ld

@@ -336,4 +336,5 @@ D_200A300 = 0x200A300;
 D_200A780 = 0x200A780;
 D_2000980 = 0x2000980;
 D_2000A60 = 0x2000A60;
-D_838067F0 = 0x838067F0;
+D_838067F0 = 0x838067F0;
+D_3008200 = 0x3008200;

src/1C720.c

@@ -158,7 +158,7 @@ unk_D_86002F58_004_000_010_02C* func_8001BEE8(unk_D_86002F58_004_000_010_02C* ar
     return arg0;
 }
 
-void func_8001C014(s32* arg0, unk_func_8001C014* arg1, u16 arg2) {
+void func_8001C014(unk_D_86002F58_004_000_010_02C* arg0, unk_func_8001C014* arg1, u16 arg2) {
     unk_func_80026268_arg0 stack;
 
     stack.unk_00.unk_00 = arg2;

src/1C720.h

@@ -43,7 +43,7 @@ void func_8001BE78(unk_D_86002F58_004_000* arg0, u8 arg1);
 void func_8001BE84(unk_D_86002F58_004_000* arg0, u8 arg1);
 unk_D_86002F58_004_000_00C_028* func_8001BE90(unk_D_86002F58_004_000* arg0, s32 arg1);
 unk_D_86002F58_004_000_010_02C* func_8001BEE8(unk_D_86002F58_004_000_010_02C* arg0, unk_func_80026268_arg0* arg1);
-void func_8001C014(s32* arg0, unk_func_8001C014* arg1, u16 arg2);
+void func_8001C014(unk_D_86002F58_004_000_010_02C* arg0, unk_func_8001C014* arg1, u16 arg2);
 void func_8001C07C(unk_func_8001C07C_arg0* arg0);
 void func_8001C198(unk_func_8001C248* arg0);
 void func_8001C1E8(unk_func_8001C248* arg0);

src/232C0.c

@@ -408,7 +408,7 @@ s8 func_80023324(s32 arg0) {
     RomHeader sp28;
     s8 var_s0 = POKEMON_ROM_NONE;
 
-    if ((func_8000B1C4(arg0, &sp28, 0x120, 0x60) == 0) && (sp28.country_code == 1)) {
+    if ((func_8000B1C4(arg0, &sp28, 0x120, sizeof(RomHeader)) == 0) && (sp28.country_code == 1)) {
         sp28.game_title[7] = '\x0';
         sp28.game_title[16] = '\x0';
 

src/232C0.h

@@ -23,9 +23,18 @@ typedef struct func_800253F4_arg1 {
     /* 0x00F */ unk_D_800AC910_050_9AC unk_00F;
 } func_800253F4_arg1; // size >= 0x1A3
 
+typedef struct unk_func_800228F0 {
+    /* 0x00 */ u8 unk_00;
+    /* 0x01 */ u8 unk_01;
+    /* 0x02 */ u16 unk_02;
+    /* 0x04 */ char unk_04[16];
+    /* 0x14 */ char unk_14[16];
+} unk_func_800228F0; // size >= 0x28
+
 u16 func_800226C0(s32 arg0, u32 arg1);
 void func_80022734(unk_func_80026268_arg0* arg0);
 void func_800228B0(unk_func_80026268_arg0* arg0);
+s32 func_800228F0(unk_func_800228F0*, u16);
 void func_80022978(unk_func_80026268_arg0* arg0, s16 arg1, u8 arg2);
 s32 func_80022A04(u16* arg0, unk_D_800AC910_040* arg1);
 u8 func_80022A28(s32 arg0);

src/fragments/50/fragment50.h

@@ -0,0 +1,49 @@
+#ifndef _FRAGMENT50_H_
+#define _FRAGMENT50_H_
+
+#include "global.h"
+
+void func_82600020(void);
+s32 func_82600094(s8* arg0, s8* arg1);
+s32 func_826000D8(void);
+Gfx* func_82600160(Gfx* arg0);
+s32 func_826007C8(s32 arg0);
+s32 func_826007F0(s32 arg0, unk_D_86002F34_alt18* arg1);
+s32 func_82600A34(s32 arg0, unk_D_86002F34_alt18* arg1);
+void func_82600C00(void);
+void func_82600C08(void);
+void func_82600C10(void);
+void func_82600CFC(void);
+void func_82600D04(void);
+void func_82600D44(s32 arg0, s32 arg1, f32 arg2, s32 arg3);
+void func_82600F78(void);
+void func_8260125C(void);
+void func_82602294(void);
+void func_82602300(s16 arg0);
+void func_826024F4(s16 arg0);
+void func_82602570(void);
+void func_82602578(s16 arg0);
+void func_82602614(s16 arg0);
+void func_826026D4(s16 arg0);
+void func_82602820(f32 arg0);
+void func_826028B8(f32 arg0);
+void func_826028CC(void);
+void func_826028D4(void);
+void func_82602A18(void);
+void func_82602A40(void);
+void func_82602AB0(void);
+void func_82602AD4(void);
+void func_82602B00(s32 arg0);
+s32 func_82602B60(s16* arg0);
+s32 func_82602F18(void);
+s32 func_82603254(void);
+s32 func_8260332C(void);
+s32 func_82603414(void);
+s32 func_826034EC(void);
+s32 func_826035D4(void);
+void func_8260365C(void);
+void func_82603800(s32 arg0, f32 arg1);
+void func_82603924(void);
+s32 func_82603D20(s32 arg0, s32 arg1);
+
+#endif // _FRAGMENT50_H_

yamls/us/rom.yaml

@@ -1860,10 +1860,10 @@
     subsegments:
     - [0x2B5350, textbin,   fragments/50/fragment50_header]
     - [0x2B5370, c,      fragments/50/fragment50]
-    - [0x2B91D0, data,   fragments/50/fragment50_data]
-    - [0x2BC690, rodata, fragments/50/fragment50_rodata]
+    - [0x2B91D0, .data,   fragments/50/fragment50]
+    - [0x2BC690, .rodata, fragments/50/fragment50]
 
-    - {vram: 0x82607410, type:  bss, name: fragments/50/fragment50_bss}
+    - {vram: 0x82607410, type:  .bss, name: fragments/50/fragment50}
 
   - name: fragment50_relocs
     type: code