mirror of
https://github.com/zeldaret/oot.git
synced 2025-10-19 04:59:53 +00:00
Set up build system and disassembly for gc-us (#1982)
* Build gc-us * Set up gc-us disassembly * Don't disasm unchanged overlays * Fix gc-eu-mq BSS * romalign link_animetion for NTSC * Explicitly set CPP defines to 0/1 * Add #ifs to segment_symbols.h * Add sButtonTextures now * Fix message _SHIFTL usage * Don't ifdef LANGUAGE_MAX
This commit is contained in:
parent
baf1e8c174
commit
bf3339a16d
32 changed files with 14124 additions and 205 deletions
|
@ -238,6 +238,12 @@ extern struct GraphicsContext* __gfxCtx;
|
|||
|
||||
#endif /* OOT_DEBUG */
|
||||
|
||||
#if OOT_NTSC
|
||||
#define LANGUAGE_ARRAY(jpn, nes, ger, fra) { jpn, nes }
|
||||
#else
|
||||
#define LANGUAGE_ARRAY(jpn, nes, ger, fra) { nes, ger, fra }
|
||||
#endif
|
||||
|
||||
/**
|
||||
* `x` vertex x
|
||||
* `y` vertex y
|
||||
|
|
|
@ -5,9 +5,6 @@
|
|||
#include "z64item.h" // For item ids
|
||||
#include "sfx.h" // For sfx ids
|
||||
|
||||
#define TEXT_LANG_US_JP 0
|
||||
#define TEXT_LANG_EU 1
|
||||
|
||||
/*
|
||||
* Text control characters
|
||||
*/
|
||||
|
|
|
@ -37,7 +37,7 @@ typedef struct {
|
|||
|
||||
/* Non-Credits Messages */
|
||||
|
||||
#if (TEXT_LANGUAGE == TEXT_LANG_US_JP)
|
||||
#if OOT_NTSC
|
||||
#define DEFINE_MESSAGE_NES(textId, type, yPos, jpnMessage, nesMessage, gerMessage, fraMessage) \
|
||||
extern const char _message_##textId##_nes[];
|
||||
|
||||
|
|
|
@ -29,6 +29,11 @@ DECLARE_ROM_SEGMENT(Audiobank)
|
|||
DECLARE_ROM_SEGMENT(Audioseq)
|
||||
DECLARE_ROM_SEGMENT(Audiotable)
|
||||
|
||||
#if OOT_NTSC
|
||||
DECLARE_SEGMENT(kanji)
|
||||
DECLARE_ROM_SEGMENT(kanji)
|
||||
#endif
|
||||
|
||||
DECLARE_SEGMENT(link_animetion)
|
||||
DECLARE_ROM_SEGMENT(link_animetion)
|
||||
|
||||
|
@ -37,9 +42,16 @@ DECLARE_ROM_SEGMENT(icon_item_24_static)
|
|||
DECLARE_ROM_SEGMENT(icon_item_field_static)
|
||||
DECLARE_ROM_SEGMENT(icon_item_dungeon_static)
|
||||
DECLARE_ROM_SEGMENT(icon_item_gameover_static)
|
||||
|
||||
#if OOT_NTSC
|
||||
DECLARE_ROM_SEGMENT(icon_item_jpn_static)
|
||||
DECLARE_ROM_SEGMENT(icon_item_nes_static)
|
||||
#else
|
||||
DECLARE_ROM_SEGMENT(icon_item_nes_static)
|
||||
DECLARE_ROM_SEGMENT(icon_item_ger_static)
|
||||
DECLARE_ROM_SEGMENT(icon_item_fra_static)
|
||||
#endif
|
||||
|
||||
DECLARE_ROM_SEGMENT(item_name_static)
|
||||
DECLARE_ROM_SEGMENT(map_name_static)
|
||||
DECLARE_ROM_SEGMENT(do_action_static)
|
||||
|
@ -47,12 +59,20 @@ DECLARE_ROM_SEGMENT(message_static)
|
|||
DECLARE_ROM_SEGMENT(message_texture_static)
|
||||
DECLARE_ROM_SEGMENT(nes_font_static)
|
||||
|
||||
#if OOT_NTSC
|
||||
DECLARE_SEGMENT(jpn_message_data_static)
|
||||
DECLARE_ROM_SEGMENT(jpn_message_data_static)
|
||||
DECLARE_SEGMENT(nes_message_data_static)
|
||||
DECLARE_ROM_SEGMENT(nes_message_data_static)
|
||||
#else
|
||||
DECLARE_SEGMENT(nes_message_data_static)
|
||||
DECLARE_ROM_SEGMENT(nes_message_data_static)
|
||||
DECLARE_SEGMENT(ger_message_data_static)
|
||||
DECLARE_ROM_SEGMENT(ger_message_data_static)
|
||||
DECLARE_SEGMENT(fra_message_data_static)
|
||||
DECLARE_ROM_SEGMENT(fra_message_data_static)
|
||||
#endif
|
||||
|
||||
DECLARE_SEGMENT(staff_message_data_static)
|
||||
DECLARE_ROM_SEGMENT(staff_message_data_static)
|
||||
|
||||
|
@ -628,6 +648,7 @@ DECLARE_ROM_SEGMENT(spot20_room_0)
|
|||
|
||||
DECLARE_ROM_SEGMENT(ganon_tou_room_0)
|
||||
|
||||
#if OOT_DEBUG
|
||||
DECLARE_ROM_SEGMENT(test01_room_0)
|
||||
|
||||
DECLARE_ROM_SEGMENT(besitu_room_0)
|
||||
|
@ -649,5 +670,6 @@ DECLARE_ROM_SEGMENT(testroom_room_1)
|
|||
DECLARE_ROM_SEGMENT(testroom_room_2)
|
||||
DECLARE_ROM_SEGMENT(testroom_room_3)
|
||||
DECLARE_ROM_SEGMENT(testroom_room_4)
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef Z64ITEM_H
|
||||
#define Z64ITEM_H
|
||||
|
||||
// Note that z_kaleido_scope_PAL.c assumes that the dimensions and texture format here also matches the dimensions and
|
||||
// Note that z_kaleido_scope.c assumes that the dimensions and texture format here also matches the dimensions and
|
||||
// texture format for MAP_NAME_TEX1_*
|
||||
#define ITEM_NAME_TEX_WIDTH 128
|
||||
#define ITEM_NAME_TEX_HEIGHT 16
|
||||
|
|
|
@ -166,7 +166,7 @@ typedef struct {
|
|||
/* 0x027C */ SkelAnime playerSkelAnime;
|
||||
} PauseContext; // size = 0x2C0
|
||||
|
||||
// Note that z_kaleido_scope_PAL.c assumes that the dimensions and texture format here also matches the dimensions and
|
||||
// Note that z_kaleido_scope.c assumes that the dimensions and texture format here also matches the dimensions and
|
||||
// texture format for ITEM_NAME_TEX_*
|
||||
#define MAP_NAME_TEX1_WIDTH 128
|
||||
#define MAP_NAME_TEX1_HEIGHT 16
|
||||
|
|
|
@ -5,10 +5,15 @@
|
|||
#include "z64math.h"
|
||||
|
||||
typedef enum {
|
||||
#if OOT_NTSC
|
||||
/* 0 */ LANGUAGE_JPN,
|
||||
/* 1 */ LANGUAGE_ENG,
|
||||
#else
|
||||
/* 0 */ LANGUAGE_ENG,
|
||||
/* 1 */ LANGUAGE_GER,
|
||||
/* 2 */ LANGUAGE_FRA,
|
||||
/* 3 */ LANGUAGE_MAX
|
||||
#endif
|
||||
/* */ LANGUAGE_MAX
|
||||
} Language;
|
||||
|
||||
// `_FORCE` means that this request will respond to `forceRisingButtonAlphas`.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue