hackern64/ultrasm64-2
0
0
Fork 0
mirror of https://github.com/HackerN64/ultrasm64-2.git synced 2026-01-21 10:38:08 -08:00
Code Issues Packages Projects Releases Wiki Activity

Refresh 16

Browse Source
This commit is contained in:
n64
2023-08-17 08:56:02 -04:00
parent 66018e9f3c
commit ae770e0df5
1326 changed files with 73566 additions and 26397 deletions
Download Patch File Download Diff File Expand all files Collapse all files

260
levels/menu/geo.c
View File

@@ -17,182 +17,182 @@
// 0x0E0001D0
const GeoLayout geo_menu_mario_save_button[] = {
GEO_NODE_START(),
GEO_OPEN_NODE(),
GEO_SCALE(0x00, 524288),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, dl_menu_mario_save_button_base),
GEO_DISPLAY_LIST(LAYER_OPAQUE, dl_menu_save_button_back),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_END(),
GEO_NODE_START(),
GEO_OPEN_NODE(),
GEO_SCALE(0x00, 524288),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, dl_menu_mario_save_button_base),
GEO_DISPLAY_LIST(LAYER_OPAQUE, dl_menu_save_button_back),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_END(),
};
// 0x0E000200
const GeoLayout geo_menu_mario_save_button_fade[] = {
GEO_NODE_START(),
GEO_OPEN_NODE(),
GEO_SCALE(0x00, 524288),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, dl_menu_mario_save_button_base),
GEO_DISPLAY_LIST(LAYER_OPAQUE, dl_menu_save_button_fade_back),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_END(),
GEO_NODE_START(),
GEO_OPEN_NODE(),
GEO_SCALE(0x00, 524288),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, dl_menu_mario_save_button_base),
GEO_DISPLAY_LIST(LAYER_OPAQUE, dl_menu_save_button_fade_back),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_END(),
};
// 0x0E000230
const GeoLayout geo_menu_mario_new_button[] = {
GEO_NODE_START(),
GEO_OPEN_NODE(),
GEO_SCALE(0x00, 524288),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, dl_menu_mario_new_button_base),
GEO_DISPLAY_LIST(LAYER_OPAQUE, dl_menu_save_button_back),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_END(),
GEO_NODE_START(),
GEO_OPEN_NODE(),
GEO_SCALE(0x00, 524288),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, dl_menu_mario_new_button_base),
GEO_DISPLAY_LIST(LAYER_OPAQUE, dl_menu_save_button_back),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_END(),
};
// 0x0E000260
const GeoLayout geo_menu_mario_new_button_fade[] = {
GEO_NODE_START(),
GEO_OPEN_NODE(),
GEO_SCALE(0x00, 524288),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, dl_menu_mario_new_button_base),
GEO_DISPLAY_LIST(LAYER_OPAQUE, dl_menu_save_button_fade_back),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_END(),
GEO_NODE_START(),
GEO_OPEN_NODE(),
GEO_SCALE(0x00, 524288),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, dl_menu_mario_new_button_base),
GEO_DISPLAY_LIST(LAYER_OPAQUE, dl_menu_save_button_fade_back),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_END(),
};
// 0x0E000290
const GeoLayout geo_menu_erase_button[] = {
GEO_NODE_START(),
GEO_OPEN_NODE(),
GEO_SCALE(0x00, 524288),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, dl_menu_erase_button),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_END(),
GEO_NODE_START(),
GEO_OPEN_NODE(),
GEO_SCALE(0x00, 524288),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, dl_menu_erase_button),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_END(),
};
// 0x0E0002B8
const GeoLayout geo_menu_copy_button[] = {
GEO_NODE_START(),
GEO_OPEN_NODE(),
GEO_SCALE(0x00, 524288),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, dl_menu_copy_button),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_END(),
GEO_NODE_START(),
GEO_OPEN_NODE(),
GEO_SCALE(0x00, 524288),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, dl_menu_copy_button),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_END(),
};
// 0x0E0002E0
const GeoLayout geo_menu_file_button[] = {
GEO_NODE_START(),
GEO_OPEN_NODE(),
GEO_SCALE(0x00, 524288),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, dl_menu_file_button),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_END(),
GEO_NODE_START(),
GEO_OPEN_NODE(),
GEO_SCALE(0x00, 524288),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, dl_menu_file_button),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_END(),
};
// 0x0E000308
const GeoLayout geo_menu_score_button[] = {
GEO_NODE_START(),
GEO_OPEN_NODE(),
GEO_SCALE(0x00, 524288),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, dl_menu_score_button),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_END(),
GEO_NODE_START(),
GEO_OPEN_NODE(),
GEO_SCALE(0x00, 524288),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, dl_menu_score_button),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_END(),
};
// 0x0E000330
const GeoLayout geo_menu_sound_button[] = {
GEO_NODE_START(),
GEO_OPEN_NODE(),
GEO_SCALE(0x00, 524288),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, dl_menu_sound_button),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_END(),
GEO_NODE_START(),
GEO_OPEN_NODE(),
GEO_SCALE(0x00, 524288),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, dl_menu_sound_button),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_END(),
};
// 0x0E000358
const GeoLayout geo_menu_generic_button[] = {
GEO_NODE_START(),
GEO_OPEN_NODE(),
GEO_SCALE(0x00, 524288),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, dl_menu_generic_button),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_END(),
GEO_NODE_START(),
GEO_OPEN_NODE(),
GEO_SCALE(0x00, 524288),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, dl_menu_generic_button),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_END(),
};
// 0x0E000380
const GeoLayout geo_menu_file_select_strings_and_menu_cursor[] = {
GEO_NODE_SCREEN_AREA(10, SCREEN_WIDTH/2, SCREEN_HEIGHT/2, SCREEN_WIDTH/2, SCREEN_HEIGHT/2),
GEO_OPEN_NODE(),
GEO_ZBUFFER(0),
GEO_OPEN_NODE(),
GEO_NODE_ORTHO(100),
GEO_OPEN_NODE(),
GEO_BACKGROUND_COLOR(0x0001),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_ZBUFFER(1),
GEO_OPEN_NODE(),
GEO_CAMERA_FRUSTUM(45, 100, 25000),
GEO_OPEN_NODE(),
GEO_CAMERA(0, 0, 0, 1000, 0, 0, 0, 0x00000000),
GEO_NODE_SCREEN_AREA(10, SCREEN_WIDTH/2, SCREEN_HEIGHT/2, SCREEN_WIDTH/2, SCREEN_HEIGHT/2),
GEO_OPEN_NODE(),
GEO_ZBUFFER(0),
GEO_OPEN_NODE(),
GEO_NODE_ORTHO(100),
GEO_OPEN_NODE(),
GEO_RENDER_OBJ(),
GEO_BACKGROUND_COLOR(0x0001),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_ZBUFFER(0),
GEO_OPEN_NODE(),
GEO_ASM(0, geo_file_select_strings_and_menu_cursor),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_END(),
GEO_CLOSE_NODE(),
GEO_ZBUFFER(1),
GEO_OPEN_NODE(),
GEO_CAMERA_FRUSTUM(45, 100, 25000),
GEO_OPEN_NODE(),
GEO_CAMERA(0, 0, 0, 1000, 0, 0, 0, 0x00000000),
GEO_OPEN_NODE(),
GEO_RENDER_OBJ(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_ZBUFFER(0),
GEO_OPEN_NODE(),
GEO_ASM(0, geo_file_select_strings_and_menu_cursor),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_END(),
};
// 0x0E000408
const GeoLayout geo_menu_act_selector_strings[] = {
GEO_NODE_SCREEN_AREA(10, SCREEN_WIDTH/2, SCREEN_HEIGHT/2, SCREEN_WIDTH/2, SCREEN_HEIGHT/2),
GEO_OPEN_NODE(),
GEO_ZBUFFER(0),
GEO_OPEN_NODE(),
GEO_NODE_ORTHO(100),
GEO_OPEN_NODE(),
GEO_BACKGROUND_COLOR(0xFFFF),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_ZBUFFER(1),
GEO_OPEN_NODE(),
GEO_CAMERA_FRUSTUM(45, 100, 25000),
GEO_OPEN_NODE(),
GEO_CAMERA(0, 0, 0, 1000, 0, 0, 0, 0x00000000),
GEO_NODE_SCREEN_AREA(10, SCREEN_WIDTH/2, SCREEN_HEIGHT/2, SCREEN_WIDTH/2, SCREEN_HEIGHT/2),
GEO_OPEN_NODE(),
GEO_ZBUFFER(0),
GEO_OPEN_NODE(),
GEO_NODE_ORTHO(100),
GEO_OPEN_NODE(),
GEO_RENDER_OBJ(),
GEO_BACKGROUND_COLOR(0xFFFF),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_ZBUFFER(0),
GEO_OPEN_NODE(),
GEO_ASM(0, geo_act_selector_strings),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_END(),
GEO_CLOSE_NODE(),
GEO_ZBUFFER(1),
GEO_OPEN_NODE(),
GEO_CAMERA_FRUSTUM(45, 100, 25000),
GEO_OPEN_NODE(),
GEO_CAMERA(0, 0, 0, 1000, 0, 0, 0, 0x00000000),
GEO_OPEN_NODE(),
GEO_RENDER_OBJ(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_ZBUFFER(0),
GEO_OPEN_NODE(),
GEO_ASM(0, geo_act_selector_strings),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_END(),
};

12
levels/menu/leveldata.c
View File

@@ -1741,6 +1741,18 @@ ALIGNED8 static const Texture texture_menu_course_lower[] = {
#include "levels/menu/main_menu_seg7_eu.0EDA0.rgba16.inc.c"
};
#elif defined(VERSION_CN)
// 0x070BCE0 - 0x070CCE0
ALIGNED8 static const Texture texture_menu_course_upper[] = {
#include "levels/menu/main_menu_seg7_cn.0BCE0.rgba16.inc.c"
};
// 0x0700CCE0 - 0x0700DCE0
ALIGNED8 static const Texture texture_menu_course_lower[] = {
#include "levels/menu/main_menu_seg7_cn.0CCE0.rgba16.inc.c"
};
#else
// 0x0700D1A8 - 0x0700E1A8

8
levels/menu/script.c
View File

@@ -22,7 +22,7 @@ const LevelScript level_main_menu_entry_1[] = {
INIT_LEVEL(),
FIXED_LOAD(/*loadAddr*/ _goddardSegmentStart, /*romStart*/ _goddardSegmentRomStart, /*romEnd*/ _goddardSegmentRomEnd),
LOAD_MIO0(/*seg*/ 0x07, _menu_segment_7SegmentRomStart, _menu_segment_7SegmentRomEnd),
LOAD_RAW(/*seg*/ 0x13, _behaviorSegmentRomStart, _behaviorSegmentRomEnd),
LOAD_RAW (/*seg*/ 0x13, _behaviorSegmentRomStart, _behaviorSegmentRomEnd),
ALLOC_LEVEL_POOL(),
LOAD_MODEL_FROM_GEO(MODEL_MAIN_MENU_MARIO_SAVE_BUTTON, geo_menu_mario_save_button),
LOAD_MODEL_FROM_GEO(MODEL_MAIN_MENU_RED_ERASE_BUTTON, geo_menu_erase_button),
@@ -36,8 +36,8 @@ const LevelScript level_main_menu_entry_1[] = {
LOAD_MODEL_FROM_GEO(MODEL_MAIN_MENU_GENERIC_BUTTON, geo_menu_generic_button),
AREA(/*index*/ 1, geo_menu_file_select_strings_and_menu_cursor),
OBJECT(/*model*/ MODEL_NONE, /*pos*/ 0, 0, -19000, /*angle*/ 0, 0, 0, /*behParam*/ 0x04000000, /*beh*/ bhvMenuButtonManager),
OBJECT(/*model*/ MODEL_MAIN_MENU_YELLOW_FILE_BUTTON, /*pos*/ 0, 0, -19000, /*angle*/ 0, 0, 0, /*behParam*/ 0x04000000, /*beh*/ bhvYellowBackgroundInMenu),
OBJECT(/*model*/ MODEL_NONE, /*pos*/ 0, 0, -19000, /*angle*/ 0, 0, 0, /*bhvParam*/ BPARAM1(0x04), /*bhv*/ bhvMenuButtonManager),
OBJECT(/*model*/ MODEL_MAIN_MENU_YELLOW_FILE_BUTTON, /*pos*/ 0, 0, -19000, /*angle*/ 0, 0, 0, /*bhvParam*/ BPARAM1(0x04), /*bhv*/ bhvYellowBackgroundInMenu),
TERRAIN(/*terrainData*/ main_menu_seg7_collision),
END_AREA(),
@@ -66,7 +66,7 @@ const LevelScript level_main_menu_entry_2[] = {
/*13*/ ALLOC_LEVEL_POOL(),
/*14*/ AREA(/*index*/ 2, geo_menu_act_selector_strings),
/*16*/ OBJECT(/*model*/ MODEL_NONE, /*pos*/ 0, -100, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x04000000, /*beh*/ bhvActSelector),
/*16*/ OBJECT(/*model*/ MODEL_NONE, /*pos*/ 0, -100, 0, /*angle*/ 0, 0, 0, /*bhvParam*/ BPARAM1(0x04), /*bhv*/ bhvActSelector),
/*22*/ TERRAIN(/*terrainData*/ main_menu_seg7_collision),
/*24*/ END_AREA(),