pal up to core1/code_E360

This commit is contained in:
Banjo Kazooie
2024-09-04 23:13:08 -05:00
parent 5593309d99
commit 4fce59f41e
4 changed files with 92 additions and 26 deletions

View File

@@ -161,11 +161,10 @@ segments:
- [0xF44b60, c, code_72B0]
- [0xF45810, c, code_7F60]
- [0xF46500, c, code_8C50]
- [0xF475C0, bin, untouched]
# # - [0xF22F80, c, code_9D30] #DONE
# # - [0xF23E00, c, code_ABB0] #DONE
# # - [0xF260B0, c, code_CE60] #DONE
# # - [0xF275B0, c, code_E360] #DONE
- [0xF475C0, c, code_ABB0]
- [0xF49870, c, code_CE60]
- [0xF4AD70, c, code_E360]
- [0xF4B4C0, bin, untouched]
# # - [0xF27D40, c, code_EAF0] #DONE
# # - [0xF29C50, c,code_10A00]
# # - [0xF2AD10, c, code_11AC0] #DONE
@@ -374,11 +373,11 @@ segments:
- [0xF74AB0, bin, data_37ED0] #unreferenced
- [0xF74AC0, .data, code_7F60]
- [0xF74AD0, .data, code_8C50]
- [0xF74C60, bin, remain_core1_data]
# # - [0xF51280, .data, code_9D30]
# # - [0xF51430, .data, code_ABB0]
# # - [0xF51440, .data, code_CE60]
# # - [0xF514B0, .data, code_E360]
- [0xF74C60, .data, code_ABB0]
- [0xF74C70, .data, code_CE60]
- [0xF74CE0, .data, code_E360]
- [0xF74DD0, bin, remain_core1_data]
# # - [0xF51550, .data, code_EAF0]
# # - [0xF51560, .data, code_10A00]
# # - [0xF51570, .data, code_11AC0]
@@ -418,9 +417,9 @@ segments:
- [0xF76710, .rodata, code_5650]
- [0xF76770, .rodata, code_72B0]
- [0xF76790, .rodata, code_7F60]
- [0xF767B0, bin, remain_core1_rodata]
# # - [0xF52F30, .rodata, code_9D30]
# # - [0xF52F50, .rodata, code_CE60]
# - [0xF767B0, .rodata, code_9D30]
- [0xF767B0, .rodata, code_CE60]
- [0xF76A80, bin, remain_core1_rodata]
# # - [0xF53220, .rodata, code_EAF0]
# # - [0xF532A0, .rodata, code_10A00]
# # - [0xF539B0, .rodata, code_11AC0]
@@ -467,9 +466,9 @@ segments:
- [0xF791D0, .bss, code_7090]
- [0xF791D0, .bss, code_72B0]
- [0xF791D0, .bss, code_8C50]
# # - [0xF791D0, .bss, code_ABB0]
# # - [0xF791D0, .bss, code_CE60]
# # - [0xF791D0, .bss, code_E360]
- [0xF791D0, .bss, code_ABB0]
- [0xF791D0, .bss, code_CE60]
- [0xF791D0, .bss, code_E360]
# # - [0xF791D0, .bss, code_EAF0]
# # - [0xF791D0, .bss, code_10A00]
# # - [0xF791D0, .bss, code_11AC0]

View File

@@ -33,10 +33,6 @@ boot_gOverlayTable = gOverlayTable;
boot_func_8023DA20 = func_8023DA20;
/* Temporary Correct*/
func_8024BDAC = 0x8024ba3c;
func_8024BE30 = 0x8024BAC0;
func_8024BFAC = 0x8024bc18;
func_8024C428 = 0x8024C078;
viewport_get_position_vec3f = 0x8024c21c;
veiwport_get_position_vec3w = 0x8024c240;
viewport_get_rotation_vec3f = 0x8024c3b4;
@@ -45,11 +41,15 @@ pfsManager_update = 0x8024e418;
pfsManager_init = 0x8024ecac;
pfsManager_getStartReadData = 0x8024ee00;
musicInstruments_init = 0x8024f130;
func_80250034 = 0x8024fc84;
func_80250530 = 0x80250180;
func_80250650 = 0x802502a0;
rumbleManager_80250C08 = 0x80250858;
rumbleManager_init = 0x802508d4;
rumbleManager_80250FC0 = 0x80250c10;
spriteGetFramePtr = 0x80250d18;
overlayManagerloadCore2 = 0x80250f58;
func_80253034 = 0x80252c84;
func_802535A8 = 0x802531f8;
func_80254008 = 0x80253c58;
func_80254028 = 0x80253c78;
@@ -72,18 +72,29 @@ ml_vec3f_normalize = 0x802560a0;
ml_vec3f_set_length_copy = 0x80256230;
ml_vec3f_yaw_rotate_copy = 0x80256550;
ml_init = 0x80257074;
ml_map_f = 0x80257768;
func_802585E0 = 0x80258230;
ml_sin_deg = 0x8025840c;
ml_cos_deg = 0x8025843c;
ml_vec3f_copy = 0x802587f4;
ml_vec3f_diff_copy = 0x80258810;
ml_vec3f_diff = 0x80258844;
ml_vec3f_add = 0x80258898;
func_8025A104 = 0x80259d54;
func_8025A55C = 0x8025a1ac;
func_8025A6CC = 0x8025a31c;
func_8025A864 = 0x8025a4b4;
func_8025A9D4 = 0x8025a624;
func_8025ABB8 = 0x8025a808;
func_8025AD7C = 0x8025a9cc;
func_8025ADBC = 0x8025aa0c;
func_8025AFB0 = 0x8025AC00;
func_8025AFB8 = 0x8025ac08;
sns_find_and_parse_payload = 0x8025ae30;
___osGetSR = 0x8025ac30;
sns_write_payload_over_heap = 0x8025b350;
DEBUG_use_special_bootmap = 0x8025b460;
sns_get_item_state = 0x8025b470;
n_alInit = 0x8025bf70;
n_alAudioFrame = 0x8025c118;
alEvtqPostEvent = 0x8025ca4c;
@@ -141,6 +152,12 @@ osSpTaskYielded = 0x802658f0;
osSpTaskYield = 0x80265970;
osViSetMode = 0x80265990;
osSetEventMesg = 0x80265a00;
osCreateViManager = 0x80265a70;
osViSetSpecialFeatures = 0x80265dd0;
osViSwapBuffer = 0x80265f90;
osViSetEvent = 0x80265fe0;
osViGetNextFramebuffer = 0x80266050;
osViBlack = 0x80266090;
framebuffer_width = 0x802762d8;
framebuffer_height = 0x802762dc;
n_syn = 0x80276bd4;
@@ -148,9 +165,17 @@ osClockRate = 0x80276e70;
osViClock = 0x80276e78;
core2_TEXT_START = 0x80286db0;
player_getPosition = 0x8028e7c4;
player_getPosition_s32 = 0x8028e95c;
func_8028EE84 = 0x8028eca4;
func_8028F22C = 0x8028f04c;
spawnQueue_func_802C3A18 = 0x802C3898;
spawnQueue_flush = 0x802c38b8;
func_802C5A30 = 0x802c5b20;
mapSpecificFlags_get = 0x802caeb8;
mapSpecificFlags_validateCRC1 = 0x802cb1cc;
func_802D686C = 0x802d6a4c;
chmole_learnedAllSpiralMountainAbilities = 0x802da678;
func_802E3580 = 0x802E3770;
func_802E35D0 = 0x802E37C0;
func_802E35D8 = 0x802E37c8;
@@ -160,7 +185,13 @@ func_802E4214 = 0x802E4404;
func_802E4424 = 0x802E4614;
game_defrag = 0x802e4ac8;
getGameMode = 0x802e4bec;
func_802F9AA8 = 0x802f9c88;
func_802F9F80 = 0x802fa160;
func_802F9FD0 = 0x802fa1b0;
func_802FA060 = 0x802fa240;
func_80309B48 = 0x80309ce8;
func_80309D58 = 0x80309ef8;
gctransition_8030BDC0 = 0x8030bf60;
gctransition_reset = 0x8030c07c;
func_8030D90C = 0x8030daac;
func_8030DA44 = 0x8030dbe4;
@@ -177,19 +208,27 @@ func_8031C5D4 = 0x8031c9b4;
func_8031C618 = 0x8031c9f8;
func_8031C638 = 0x8031ca18;
func_80320240 = 0x80320630;
func_803203FC = 0x803207ec;
func_8032056C = 0x8032095C;
func_80320B98 = 0x80320f88;
func_80320C94 = 0x80321084;
func_80320DB0 = 0x803211a0;
jiggyscore_isCollected = 0x803213d0;
levelSpecificFlags_get = 0x803222d4;
levelSpecificFlags_validateCRC1 = 0x8032243c;
func_8032274C = 0x80322b4c;
func_80322758 = 0x80322b58;
func_80323240 = 0x80323690;
marker_getActor = 0x80329db0;
map_get = 0x80334d10;
sfxInstruments_init = 0x80335670;
assetCache_init = 0x8033bfd4;
func_8033BD6C = 0x8033C1BC;
time_getDelta = 0x8033e1ec;
func_8033EF58 = 0x8033f3a8;
func_8033EFB0 = 0x8033f400;
func_8034C630 = 0x8034ca90;
func_8034E698 = 0x8034eaf8;
/* Temporary */

View File

@@ -2,7 +2,9 @@
#include "functions.h"
#include "variables.h"
#include "version.h"
#if VERSION == VERSION_USA_1_0
extern u16 D_803A5D00[2][0xF660]; //framebuffer
extern s32 framebuffer_width; //framebuffer width
extern s32 framebuffer_height; //framebuffer height
@@ -437,4 +439,4 @@ s32 func_802485BC(void){
void func_802485C8(UNK_TYPE(s32) arg0){
}
#endif

View File

@@ -1,7 +1,7 @@
#include <ultra64.h>
#include "functions.h"
#include "variables.h"
#include "version.h"
void func_8024BF94(s32 arg0);
@@ -52,6 +52,27 @@ OSViMode D_80275CD0 = {
}
};
#if VERSION == VERSION_PAL
OSViMode D_PAL_80275CD0 = {
OS_VI_PAL_LPN1,
{
VI_CTRL_TYPE_16 | VI_CTRL_GAMMA_DITHER_ON | VI_CTRL_GAMMA_ON | VI_CTRL_DIVOT_ON | 0x3100, /*ctrl*/
292, /* width*/
0x404233A, /* burst*/
0x271, /* vSync*/
0x150C69, /* hSync*/
0xC6F0C6E, /* leap */
0x9802E1, /* hstart */
0x200, /* xScale */
0x0, /* vCurrent */
},
{
{0x248, 0x350, 0x48024C, 0x9026B, 2},
{0x248, 0x350, 0x48024C, 0x9026B, 2},
}
};
#endif
// 42200000 3FAD097B 41F00000 457A0000
// C3A68832 DDC3A724 00000000 00000000
@@ -65,7 +86,7 @@ OSMesg D_80280788[10];
OSMesgQueue D_802807B0;
OSMesg D_802807C8[1];
OSMesgQueue D_802807D0;
OSMesg D_802807E8[60];
OSMesg D_802807E8[FRAMERATE];
volatile s32 D_802808D8;
s32 D_802808DC;
OSThread D_802808E0;
@@ -108,17 +129,20 @@ void func_8024BE30(void){
func_8024C428();
osCreateViManager(0xfe);
#if VERSION == VERSION_USA_1_0
if(osTvType != OS_TV_NTSC)
osViSetMode(&D_80275CD0); //PAL
else
osViSetMode(&D_80275C80); //NTSC
#elif VERSION == VERSION_PAL
osViSetMode(&D_PAL_80275CD0); //PAL
#endif
osViSetSpecialFeatures(OS_VI_DITHER_FILTER_ON);
osViSetSpecialFeatures(OS_VI_GAMMA_OFF);
osViSwapBuffer(&D_803A5D00);
osCreateMesgQueue(&D_80280770, D_80280788, 10);
osCreateMesgQueue(&D_802807B0, D_802807C8, 1);
osCreateMesgQueue(&D_802807D0, D_802807E8, 60);
osCreateMesgQueue(&D_802807D0, D_802807E8, FRAMERATE);
osViSetEvent(&D_80280770,NULL,1);
D_80280720 = 0;
D_80280724 = 1;
@@ -207,7 +231,9 @@ void func_8024C2F8(void *arg0){
func_80247380();
D_802808D8++;
if(D_802808D8 == 420){
#if VERSION == VERSION_USA_1_0
func_802485BC();
#endif
}
osSendMesg(&D_802807D0, NULL, OS_MESG_NOBLOCK);