gc-us OK (#2018)

Match BSS order and delete disassembly data

Makefile

@@ -18,11 +18,12 @@ ORIG_COMPILER ?= 0
 # If COMPILER is "gcc", compile with GCC instead of IDO.
 COMPILER ?= ido
 # Target game version. Currently the following versions are supported:
+#   gc-us          GameCube US
 #   gc-eu          GameCube Europe/PAL
 #   gc-eu-mq       GameCube Europe/PAL Master Quest
 #   gc-eu-mq-dbg   GameCube Europe/PAL Master Quest Debug (default)
 # The following versions are work-in-progress and not yet matching:
-#   gc-us          GameCube US
+#   (none currently)
 VERSION ?= gc-eu-mq-dbg
 # Number of threads to extract and compress with
 N_THREADS ?= $(shell nproc)

src/boot/idle.c

@@ -1,7 +1,7 @@
 #include "global.h"
 #include "terminal.h"
 
-#pragma increment_block_number "gc-eu:64 gc-eu-mq:64"
+#pragma increment_block_number "gc-eu:64 gc-eu-mq:64 gc-us:64"
 
 OSThread sMainThread;
 STACK(sMainStack, 0x900);

src/code/fault.c

@@ -44,7 +44,7 @@
 #include "terminal.h"
 #include "alloca.h"
 
-#pragma increment_block_number "gc-eu:64 gc-eu-mq:64 gc-eu-mq-dbg:0"
+#pragma increment_block_number "gc-eu:64 gc-eu-mq:64 gc-eu-mq-dbg:0 gc-us:64"
 
 void FaultDrawer_Init(void);
 void FaultDrawer_SetOsSyncPrintfEnabled(u32 enabled);

src/code/main.c

@@ -7,7 +7,7 @@ s32 gScreenWidth = SCREEN_WIDTH;
 s32 gScreenHeight = SCREEN_HEIGHT;
 u32 gSystemHeapSize = 0;
 
-#pragma increment_block_number "gc-eu:0 gc-eu-mq:0"
+#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-us:0"
 
 PreNmiBuff* gAppNmiBufferPtr;
 Scheduler gScheduler;

src/code/sys_math3d.c

@@ -5,7 +5,7 @@
 #include "macros.h"
 #include "sys_math3d.h"
 
-#pragma increment_block_number "gc-eu:108 gc-eu-mq:108"
+#pragma increment_block_number "gc-eu:108 gc-eu-mq:108 gc-us:108"
 
 s32 Math3D_LineVsLineClosestTwoPoints(Vec3f* lineAPointA, Vec3f* lineAPointB, Vec3f* lineBPointA, Vec3f* lineBPointB,
                                       Vec3f* lineAClosestToB, Vec3f* lineBClosestToA);

src/code/z_actor.c

@@ -8,7 +8,7 @@
 #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h"
 #include "assets/objects/object_bdoor/object_bdoor.h"
 
-#pragma increment_block_number "gc-eu:0 gc-eu-mq:0"
+#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-us:0"
 
 static CollisionPoly* sCurCeilingPoly;
 static s32 sCurCeilingBgId;
@@ -1905,7 +1905,7 @@ s32 func_8002F9EC(PlayState* play, Actor* actor, CollisionPoly* poly, s32 bgId,
     return false;
 }
 
-#pragma increment_block_number "gc-eu:22 gc-eu-mq:22"
+#pragma increment_block_number "gc-eu:22 gc-eu-mq:22 gc-us:22"
 
 // Local data used for Farore's Wind light (stored in BSS)
 LightInfo D_8015BC00;

src/code/z_camera.c

@@ -4,7 +4,7 @@
 #include "terminal.h"
 #include "overlays/actors/ovl_En_Horse/z_en_horse.h"
 
-#pragma increment_block_number "gc-eu:0 gc-eu-mq:0"
+#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-us:0"
 
 s16 Camera_RequestSettingImpl(Camera* camera, s16 requestedSetting, s16 flags);
 s32 Camera_RequestModeImpl(Camera* camera, s16 requestedMode, u8 forceModeChange);
@@ -3630,7 +3630,7 @@ s32 Camera_KeepOn3(Camera* camera) {
     return 1;
 }
 
-#pragma increment_block_number "gc-eu:128 gc-eu-mq:128"
+#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-us:128"
 
 s32 Camera_KeepOn4(Camera* camera) {
     static Vec3f D_8015BD50;

src/code/z_collision_check.c

@@ -12,7 +12,7 @@ typedef s32 (*ColChkLineFunc)(PlayState*, CollisionCheckContext*, Collider*, Vec
 
 #define SAC_ENABLE (1 << 0)
 
-#pragma increment_block_number "gc-eu:64 gc-eu-mq:64"
+#pragma increment_block_number "gc-eu:64 gc-eu-mq:64 gc-us:64"
 
 #if OOT_DEBUG
 /**
@@ -2693,7 +2693,7 @@ typedef enum {
     /* 2 */ MASSTYPE_NORMAL
 } ColChkMassType;
 
-#pragma increment_block_number "gc-eu:252 gc-eu-mq:252"
+#pragma increment_block_number "gc-eu:252 gc-eu-mq:252 gc-us:252"
 
 /**
  * Get mass type. Immovable colliders cannot be pushed, while heavy colliders can only be pushed by heavy and immovable

src/code/z_common_data.c

@@ -1,6 +1,6 @@
 #include "global.h"
 
-#pragma increment_block_number "gc-eu:128 gc-eu-mq:128"
+#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-us:128"
 
 ALIGNED(16) SaveContext gSaveContext;
 u32 D_8015FA88;

src/code/z_demo.c

@@ -120,7 +120,7 @@ u16 gCamAtSplinePointsAppliedFrame;
 u16 gCamEyePointAppliedFrame;
 u16 gCamAtPointAppliedFrame;
 
-#pragma increment_block_number "gc-eu:0 gc-eu-mq:0"
+#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-us:0"
 
 // Cam ID to return to when a scripted cutscene is finished
 s16 sReturnToCamId;

src/code/z_kaleido_scope_call.c

@@ -1,7 +1,7 @@
 #include "global.h"
 #include "terminal.h"
 
-#pragma increment_block_number "gc-eu:128 gc-eu-mq:128"
+#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-us:128"
 
 void (*sKaleidoScopeUpdateFunc)(PlayState* play);
 void (*sKaleidoScopeDrawFunc)(PlayState* play);

src/code/z_kankyo.c

@@ -7,7 +7,7 @@
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h"
 
-#pragma increment_block_number "gc-eu:128 gc-eu-mq:128"
+#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-us:128"
 
 typedef enum {
     /* 0x00 */ LIGHTNING_BOLT_START,
@@ -212,7 +212,7 @@ s16 sLightningFlashAlpha;
 s16 sSunDepthTestX;
 s16 sSunDepthTestY;
 
-#pragma increment_block_number "gc-eu:128 gc-eu-mq:128"
+#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-us:128"
 
 LightNode* sNGameOverLightNode;
 LightInfo sNGameOverLightInfo;

src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c

@@ -100,19 +100,19 @@ static ColliderCylinderInit sLightBallCylinderInit = {
 static u8 D_808E4C58[] = { 0, 12, 10, 12, 14, 16, 12, 14, 16, 12, 14, 16, 12, 14, 16, 10, 16, 14 };
 static Vec3f sZeroVec = { 0.0f, 0.0f, 0.0f };
 
-#pragma increment_block_number "gc-eu:128 gc-eu-mq:128"
+#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-us:128"
 
 static EnGanonMant* sCape;
 
 // TODO: There's probably a way to match BSS ordering with less padding by spreading the variables out and moving
 // data around. It would be easier if we had more options for controlling BSS ordering in debug.
-#pragma increment_block_number "gc-eu:128 gc-eu-mq:128"
+#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-us:128"
 
 static s32 sSeed1;
 static s32 sSeed2;
 static s32 sSeed3;
 
-#pragma increment_block_number "gc-eu:192 gc-eu-mq:192"
+#pragma increment_block_number "gc-eu:192 gc-eu-mq:192 gc-us:192"
 
 static BossGanon* sGanondorf;
 

src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c

@@ -53,7 +53,7 @@ ActorProfile En_Wonder_Item_Profile = {
     /**/ NULL,
 };
 
-#pragma increment_block_number "gc-eu:0 gc-eu-mq:0"
+#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-us:0"
 
 static Vec3f sTagPointsFree[9];
 static Vec3f sTagPointsOrdered[9];

src/overlays/actors/ovl_En_Xc/z_en_xc.c

@@ -14,7 +14,7 @@
 #include "assets/scenes/dungeons/ice_doukutu/ice_doukutu_scene.h"
 #include "terminal.h"
 
-#pragma increment_block_number "gc-eu:0 gc-eu-mq:0"
+#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-us:0"
 
 #define FLAGS ACTOR_FLAG_4
 
@@ -1395,7 +1395,7 @@ void func_80B3F3D8(void) {
     Sfx_PlaySfxCentered2(NA_SE_PL_SKIP);
 }
 
-#pragma increment_block_number "gc-eu:128 gc-eu-mq:128"
+#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-us:128"
 
 void EnXc_PlayDiveSFX(Vec3f* src, PlayState* play) {
     static Vec3f D_80B42DA0;

src/overlays/actors/ovl_Fishing/z_fishing.c

@@ -11,7 +11,7 @@
 #include "ichain.h"
 #include "terminal.h"
 
-#pragma increment_block_number "gc-eu:206 gc-eu-mq:206"
+#pragma increment_block_number "gc-eu:206 gc-eu-mq:206 gc-us:208"
 
 #define FLAGS ACTOR_FLAG_4
 

src/overlays/actors/ovl_player_actor/z_player.c

@@ -354,19 +354,19 @@ void Player_Action_CsAction(Player* this, PlayState* play);
 
 // .bss part 1
 
-#pragma increment_block_number "gc-eu:0 gc-eu-mq:0"
+#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-us:0"
 
 static s32 D_80858AA0;
 
 // TODO: There's probably a way to match BSS ordering with less padding by spreading the variables out and moving
 // data around. It would be easier if we had more options for controlling BSS ordering in debug.
-#pragma increment_block_number "gc-eu:128 gc-eu-mq:128"
+#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-us:128"
 
 static s32 D_80858AA4;
 static Vec3f sInteractWallCheckResult;
 static Input* sControlInput;
 
-#pragma increment_block_number "gc-eu:192 gc-eu-mq:192"
+#pragma increment_block_number "gc-eu:192 gc-eu-mq:192 gc-us:192"
 
 // .data
 

tools/disasm/gc-us/file_addresses.csv

@@ -1,7 +0,0 @@
-name,vrom_start,vrom_end,rom_start,rom_end,vram_start,overlay_dir
-code,A86000,B8AA60,A62500,AFDAA0,80010EE0,
-ovl_file_choose,B8E090,B9DFF0,AFFCF0,B08BF0,80803630,gamestates
-ovl_kaleido_scope,B9DFF0,BBA770,B08BF0,B17940,808135B0,misc
-ovl_player_actor,BBA770,BE0E80,B17940,B30C90,8082FDA0,actors
-ovl_En_Mag,DFA080,DFC9B0,C8E1E0,C8FEA0,80A884E0,actors
-ovl_Fishing,EB6810,ECA2E0,D061D0,D13750,80B44FE0,actors

tools/disasm/gc-us/files_code.csv

@@ -1,467 +0,0 @@
-offset,vram,.text
-0,80010EE0,src/code/z_en_a_keep
-AA0,80011980,src/code/z_en_item00
-2EA0,80013D80,src/code/z_eff_blure
-62D0,800171B0,src/code/z_eff_shield_particle
-7930,80018810,src/code/z_eff_spark
-8FE0,80019EC0,src/code/z_eff_ss_dead
-9790,8001A670,src/code/z_effect
-9F10,8001ADF0,src/code/z_effect_soft_sprite
-A9B0,8001B890,src/code/z_effect_soft_sprite_old_init
-D4D0,8001E3B0,src/code/flg_set
-D8F0,8001E7D0,src/code/z_DLF
-DB40,8001EA20,src/code/z_actor
-1A0E0,8002AFC0,src/code/z_actor_dlftbls
-1A230,8002B110,src/code/z_bgcheck
-23E10,80034CF0,src/code/code_800430A0
-24130,80035010,src/code/code_80043480
-244C0,800353A0,src/code/z_camera
-38AF0,800499D0,src/code/z_collision_btltbls
-38B50,80049A30,src/code/z_collision_check
-407D0,800516B0,src/code/z_common_data
-40860,80051740,src/code/z_debug
-40B70,80051A50,src/code/z_debug_display
-41030,80051F10,src/code/z_demo
-45D10,80056BF0,src/code/code_80069420
-45DA0,80056C80,src/code/z_draw
-47CA0,80058B80,src/code/z_sfx_source
-47E60,80058D40,src/code/z_elf_message
-48540,80059420,src/code/z_face_reaction
-48590,80059470,src/code/code_8006C3A0
-48710,800595F0,src/code/z_fcurve_data
-48950,80059830,src/code/z_fcurve_data_skelanime
-49160,8005A040,src/code/z_horse
-49E40,8005AD20,src/code/z_jpeg
-4A600,8005B4E0,src/code/z_kaleido_setup
-4A9D0,8005B8B0,src/code/z_kanfont
-4ABE0,8005BAC0,src/code/z_kankyo
-523F0,800632D0,src/code/z_lib
-53590,80064470,src/code/z_lifemeter
-54930,80065810,src/code/z_lights
-559D0,800668B0,src/code/z_malloc
-55BB0,80066A90,src/code/z_map_mark
-561B0,80067090,src/code/z_prenmi_buff
-56270,80067150,src/code/z_nulltask
-562F0,800671D0,src/code/z_olib
-569E0,800678C0,src/code/z_onepointdemo
-5A980,8006B860,src/code/z_map_exp
-5C520,8006D400,src/code/z_parameter
-67BF0,80078AD0,src/code/z_path
-67DC0,80078CA0,src/code/z_frame_advance
-67E70,80078D50,src/code/z_player_lib
-6B8E0,8007C7C0,src/code/z_prenmi
-6BA80,8007C960,src/code/z_quake
-6C8F0,8007D7D0,src/code/z_rcp
-6E1B0,8007F090,src/code/z_room
-6F9A0,80080880,src/code/z_sample
-6FDA0,80080C80,src/code/code_80097A00
-6FF60,80080E40,src/code/z_scene
-71410,800822F0,src/code/z_scene_table
-77C10,80088AF0,src/code/z_skelanime
-7C600,8008D4E0,src/code/z_skin
-7D1A0,8008E080,src/code/z_skin_awb
-7DAB0,8008E990,src/code/z_skin_matrix
-7EE50,8008FD30,src/code/z_sram
-80190,80091070,src/code/z_ss_sram
-80360,80091240,src/code/z_rumble
-805E0,800914C0,src/code/z_view
-81CE0,80092BC0,src/code/z_vimode
-82850,80093730,src/code/z_viscvg
-829F0,800938D0,src/code/z_vismono
-83210,800940F0,src/code/z_viszbuf
-834A0,80094380,src/code/z_vr_box
-85D70,80096C50,src/code/z_vr_box_draw
-86450,80097330,src/code/z_player_call
-865C0,800974A0,src/code/z_fbdemo
-86FE0,80097EC0,src/code/z_fbdemo_triforce
-875A0,80098480,src/code/z_fbdemo_wipe1
-87A10,800988F0,src/code/z_fbdemo_circle
-880D0,80098FB0,src/code/z_fbdemo_fade
-88430,80099310,src/code/shrink_window
-885A0,80099480,src/code/code_800BB0A0
-88A70,80099950,src/code/z_kaleido_manager
-88CA0,80099B80,src/code/z_kaleido_scope_call
-88F80,80099E60,src/code/z_play
-8C9E0,8009D8C0,src/code/PreRender
-8EAD0,8009F9B0,src/code/TwoHeadGfxArena
-8ECE0,8009FBC0,src/code/TwoHeadArena
-8EEA0,8009FD80,src/code/audio_stop_all_sfx
-8EEF0,8009FDD0,src/code/audio_thread_manager
-8F300,800A01E0,src/code/title_setup
-8F370,800A0250,src/code/game
-8FAF0,800A09D0,src/code/gamealloc
-8FC30,800A0B10,src/code/graph
-905D0,800A14B0,src/code/gfxalloc
-90630,800A1510,src/code/listalloc
-90780,800A1660,src/code/main
-90AE0,800A19C0,src/code/padmgr
-915E0,800A24C0,src/code/sched
-92260,800A3140,src/code/speed_meter
-92CA0,800A3B80,src/code/sys_cfb
-92DC0,800A3CA0,src/code/sys_math
-93060,800A3F40,src/code/sys_math3d
-98E30,800A9D10,src/code/sys_math_atan
-99060,800A9F40,src/code/sys_matrix
-9B460,800AC340,src/code/sys_ucode
-9B4B0,800AC390,src/code/sys_rumble
-9B810,800AC6F0,src/code/code_800D31A0
-9B840,800AC720,src/code/irqmgr
-9BE60,800ACD40,src/code/fault
-9E6B0,800AF590,src/code/fault_drawer
-9F130,800B0010,src/code/kanread
-9FC20,800B0B00,src/audio/lib/synthesis
-A2D80,800B3C60,src/audio/lib/heap
-A6150,800B7030,src/audio/lib/load
-A9F40,800BAE20,src/audio/lib/thread
-AB7A0,800BC680,src/audio/lib/dcache
-AB820,800BC700,src/audio/lib/aisetnextbuf
-AB8A0,800BC780,src/audio/lib/playback
-AD820,800BE700,src/audio/lib/effects
-AE2A0,800BF180,src/audio/lib/seqplayer
-B18C0,800C27A0,src/audio/general
-B7A50,800C8930,src/audio/sfx
-B98B0,800CA790,src/audio/sequence
-BB4D0,800CC3B0,src/code/gfxprint
-BC240,800CD120,src/code/rcp_utils
-BC2A0,800CD180,src/code/loadfragment2
-BC300,800CD1E0,src/code/relocation
-BC540,800CD420,src/code/load
-BC610,800CD4F0,src/code/code_800FC620
-BC950,800CD830,src/code/padutils
-BCB40,800CDA20,src/code/padsetup
-BCC80,800CDB60,src/code/fp_math
-BD190,800CE070,src/code/fp
-BD2F0,800CE1D0,src/code/system_malloc
-BD4C0,800CE3A0,src/code/rand
-BD680,800CE560,src/code/__osMalloc
-BE430,800CF310,src/libultra/libc/sprintf
-BE500,800CF3E0,src/code/printutils
-BE560,800CF440,src/code/sleep
-BE700,800CF5E0,src/code/jpegutils
-BEC10,800CFAF0,src/code/jpegdecoder
-BF200,800D00E0,src/libultra/mgu/scale
-BF2B0,800D0190,src/libultra/gu/sinf
-BF470,800D0350,src/libultra/gu/sins
-BF4E0,800D03C0,src/libultra/io/sptask
-BF7A0,800D0680,src/libultra/io/motor
-BFB70,800D0A50,src/libultra/io/siacs
-BFC30,800D0B10,src/libultra/io/controller
-BFF10,800D0DF0,src/libultra/io/contreaddata
-C00F0,800D0FD0,src/libultra/gu/perspective
-C0380,800D1260,src/libultra/io/sprawdma
-C0410,800D12F0,src/libultra/io/sirawdma
-C04C0,800D13A0,src/libultra/io/sptaskyield
-C04E0,800D13C0,src/libultra/mgu/mtxidentf
-C0530,800D1410,src/libultra/gu/lookat
-C0850,800D1730,src/libultra/os/stoptimer
-C0940,800D1820,src/libultra/gu/sqrtf
-C0950,800D1830,src/libultra/os/afterprenmi
-C0970,800D1850,src/libultra/io/contquery
-C0A10,800D18F0,src/libultra/gu/lookathil
-C1290,800D2170,src/libultra/libc/xprintf
-C1F70,800D2E50,src/libultra/libc/string
-C2010,800D2EF0,src/libultra/io/sp
-C2040,800D2F20,src/libultra/mgu/mtxident
-C2090,800D2F70,src/libultra/gu/position
-C22A0,800D3180,src/libultra/io/sptaskyielded
-C2300,800D31E0,src/libultra/gu/rotate
-C24D0,800D33B0,src/libultra/io/aisetfreq
-C2620,800D3500,src/libultra/os/getactivequeue
-C2640,800D3520,src/libultra/mgu/normalize
-C26A0,800D3580,src/libultra/io/dpgetstat
-C26B0,800D3590,src/libultra/io/dpsetstat
-C26C0,800D35A0,src/libultra/gu/ortho
-C2880,800D3760,src/libultra/gu/cosf
-C29F0,800D38D0,src/libultra/gu/coss
-C2A20,800D3900,src/libultra/io/visetevent
-C2A80,800D3960,src/libultra/gu/us2dex
-C2C00,800D3AE0,src/libultra/io/pfsselectbank
-C2C80,800D3B60,src/libultra/io/contsetch
-C2CE0,800D3BC0,src/libultra/io/aigetlen
-C2D00,800D3BE0,src/libultra/mgu/translate
-C2DD0,800D3CB0,src/libultra/io/contramwrite
-C3020,800D3F00,src/libultra/io/pfsgetstatus
-C3250,800D4130,src/libultra/io/contpfs
-C3DD0,800D4CB0,src/libultra/io/contramread
-C4000,800D4EE0,src/libultra/io/crc
-C4170,800D5050,src/libultra/io/pfsisplug
-C4460,800D5340,src/libultra/os/settimer
-C45F0,800D54D0,src/libultra/libc/xldtob
-C5100,800D5FE0,src/libultra/libc/ldiv
-C5290,800D6170,src/libultra/libc/xlitob
-C5530,800D6410,src/libultra/io/spgetstat
-C5540,800D6420,src/libultra/io/spsetstat
-C5550,800D6430,src/libultra/os/writebackdcacheall
-C5580,800D6460,src/libultra/os/getcurrfaultedthread
-C55A0,800D6480,src/libultra/mgu/mtxf2l
-C5610,800D64F0,src/libultra/libc/llcvt
-C5820,800D6700,src/libultra/io/vigetcurrframebuf
-C5860,800D6740,src/libultra/io/spsetpc
-C5890,800D6770,src/libultra/libc/sqrt
-C58A0,800D6780,src/libultra/libc/absf
-C58B0,800D6790,src/code/fmodf
-C5900,800D67E0,src/code/__osMemset
-C5930,800D6810,src/code/__osMemmove
-C59C0,800D68A0,src/code/z_message
-D1060,800E1F40,src/code/z_game_over
-D15A0,800E2480,src/code/z_construct
-D2960,800E3840,data/rsp.text
-
-offset,vram,.data
-D5CC0,800E6BA0,src/code/z_en_a_keep
-D5D60,800E6C40,src/code/z_en_item00
-D6000,800E6EE0,src/code/z_eff_blure
-D60B0,800E6F90,src/code/z_eff_shield_particle
-D6100,800E6FE0,src/code/z_effect
-D6150,800E7030,src/code/z_effect_soft_sprite
-D6160,800E7040,src/code/z_effect_soft_sprite_old_init
-D6250,800E7130,src/code/z_effect_soft_sprite_dlftbls
-D6660,800E7540,src/code/flg_set
-D6820,800E7700,src/code/z_actor
-D6B40,800E7A20,src/code/z_actor_dlftbls
-DA630,800EB510,src/code/z_bgcheck
-DA780,800EB660,src/code/z_camera
-DDCD0,800EEBB0,src/code/z_collision_btltbls
-DDFB0,800EEE90,src/code/z_collision_check
-DE260,800EF140,src/code/z_debug
-DE290,800EF170,src/code/z_debug_display
-DE2E0,800EF1C0,src/code/z_demo
-DE440,800EF320,src/code/z_draw
-DF4C0,800F03A0,src/code/z_elf_message
-DF510,800F03F0,src/code/z_face_reaction
-DF950,800F0830,src/code/z_game_dlftbls
-DFA70,800F0950,src/code/z_horse
-DFB80,800F0A60,src/code/z_jpeg
-DFBC0,800F0AA0,src/code/z_kaleido_setup
-DFC10,800F0AF0,src/code/z_kankyo
-E0000,800F0EE0,src/code/z_lib
-E0030,800F0F10,src/code/z_lifemeter
-E0150,800F1030,src/code/z_lights
-E0160,800F1040,src/code/z_map_mark
-E0220,800F1100,src/code/z_onepointdemo
-E3B40,800F4A20,src/code/z_map_exp
-E3B60,800F4A40,src/code/z_map_data
-E5960,800F6840,src/code/z_parameter
-E5C60,800F6B40,src/code/z_player_lib
-E6340,800F7220,src/code/z_quake
-E6370,800F7250,src/code/z_rcp
-E7190,800F8070,src/code/z_room
-E7210,800F80F0,src/code/code_80097A00
-E7590,800F8470,src/code/z_scene
-E7610,800F84F0,src/code/object_table
-E82B0,800F9190,src/code/z_scene_table
-EA4C0,800FB3A0,src/code/z_skelanime
-EA4E0,800FB3C0,src/code/z_skin_matrix
-EA520,800FB400,src/code/z_sram
-EA6D0,800FB5B0,src/code/z_ss_sram
-EA780,800FB660,data/unk_8012ABC0.data
-EA7B0,800FB690,src/code/z_view
-EA7C0,800FB6A0,src/code/z_viscvg
-EA850,800FB730,src/code/z_vr_box
-EAB50,800FBA30,src/code/z_player_call
-EAB70,800FBA50,src/code/z_fbdemo
-EABF0,800FBAD0,src/code/z_fbdemo_triforce
-EACC0,800FBBA0,src/code/z_fbdemo_wipe1
-EB760,800FC640,src/code/z_fbdemo_circle
-ECA60,800FD940,src/code/z_fbdemo_fade
-ECA90,800FD970,src/code/shrink_window
-ECAA0,800FD980,src/code/z_kaleido_manager
-ECAF0,800FD9D0,src/code/z_play
-ECB00,800FD9E0,src/code/audio_stop_all_sfx
-ECB10,800FD9F0,src/code/graph
-ECB20,800FDA00,src/code/main
-ECB30,800FDA10,src/code/padmgr
-ECB40,800FDA20,src/code/speed_meter
-ECB70,800FDA50,src/code/sys_math
-ECBB0,800FDA90,src/code/sys_math_atan
-ED3C0,800FE2A0,src/code/sys_matrix
-ED440,800FE320,src/code/sys_ucode
-ED450,800FE330,src/code/sys_rumble
-ED460,800FE340,src/code/irqmgr
-ED480,800FE360,src/code/fault
-ED4E0,800FE3C0,src/code/fault_drawer
-ED520,800FE400,src/audio/lib/data
-EF930,80100810,src/audio/lib/synthesis
-EF960,80100840,src/audio/lib/load
-EF970,80100850,src/audio/lib/thread
-EF990,80100870,src/audio/lib/aisetnextbuf
-EF9A0,80100880,src/audio/lib/effects
-EF9B0,80100890,src/audio/lib/seqplayer
-EFA00,801008E0,src/audio/general
-F1120,80102000,src/audio/sfx_params
-F24F0,801033D0,src/audio/data
-F2560,80103440,src/audio/session_config
-F2D00,80103BE0,src/code/logseverity
-F2D10,80103BF0,src/code/gfxprint
-F35C0,801044A0,src/code/code_800FC620
-F35E0,801044C0,src/code/fp
-F35F0,801044D0,src/code/rand
-F3600,801044E0,src/code/__osMalloc
-F3610,801044F0,src/libultra/gu/sins
-F3E10,80104CF0,src/libultra/io/siacs
-F3E20,80104D00,src/libultra/io/controller
-F3E30,80104D10,src/libultra/libc/xprintf
-F3E80,80104D60,src/libultra/gu/position
-F3E90,80104D70,src/libultra/gu/rotate
-F3EA0,80104D80,src/libultra/io/vimodefpallan1
-F3EF0,80104DD0,src/libultra/io/contpfs
-F3F00,80104DE0,src/libultra/io/contramread
-F3F10,80104DF0,src/libultra/libc/xlitob
-
-offset,vram,.rodata
-F3F40,80104E20,src/code/z_en_a_keep
-F3F90,80104E70,src/code/z_en_item00
-F4200,801050E0,src/code/z_eff_blure
-F4230,80105110,src/code/z_eff_shield_particle
-F4240,80105120,src/code/z_eff_spark
-F4250,80105130,src/code/z_eff_ss_dead
-F4260,80105140,src/code/z_effect_soft_sprite_old_init
-F4280,80105160,src/code/flg_set
-F4610,801054F0,src/code/z_actor
-F4BC0,80105AA0,src/code/z_actor_dlftbls
-F4C10,80105AF0,src/code/z_bgcheck
-F4CB0,80105B90,src/code/code_80043480
-F4CC0,80105BA0,src/code/z_camera
-F5440,80106320,src/code/z_collision_check
-F5490,80106370,src/code/z_debug
-F54A0,80106380,src/code/z_demo
-F5980,80106860,src/code/z_draw
-F5990,80106870,src/code/z_elf_message
-F5AB0,80106990,src/code/z_fcurve_data
-F5AC0,801069A0,src/code/z_fcurve_data_skelanime
-F5AD0,801069B0,src/code/z_horse
-F5AE0,801069C0,src/code/z_jpeg
-F5B70,80106A50,src/code/z_kankyo
-F5C20,80106B00,src/code/z_lib
-F5C30,80106B10,src/code/z_lifemeter
-F5C50,80106B30,src/code/z_lights
-F5C60,80106B40,src/code/z_map_mark
-F5CC0,80106BA0,src/code/z_olib
-F5CE0,80106BC0,src/code/z_onepointdemo
-F65A0,80107480,src/code/z_map_exp
-F68C0,801077A0,src/code/z_parameter
-F6AD0,801079B0,src/code/z_path
-F6AE0,801079C0,src/code/z_player_lib
-F6B40,80107A20,src/code/z_quake
-F6BD0,80107AB0,src/code/z_room
-F6C10,80107AF0,src/code/z_sample
-F6C20,80107B00,src/code/z_scene_table
-F6C60,80107B40,src/code/z_skelanime
-F6C80,80107B60,src/code/z_skin
-F6C90,80107B70,src/code/z_skin_matrix
-F6CA0,80107B80,src/code/z_sram
-F6D10,80107BF0,src/code/z_rumble
-F6D20,80107C00,src/code/z_view
-F6D30,80107C10,src/code/z_vr_box
-F6E20,80107D00,src/code/z_fbdemo_triforce
-F6E30,80107D10,src/code/z_fbdemo_wipe1
-F6E40,80107D20,src/code/z_fbdemo_circle
-F6E50,80107D30,src/code/code_800BB0A0
-F6E60,80107D40,src/code/z_kaleido_manager
-F6E80,80107D60,src/code/z_play
-F6F40,80107E20,src/code/game
-F6F60,80107E40,src/code/graph
-F6FB0,80107E90,src/code/main
-F6FE0,80107EC0,src/code/padmgr
-F6FF0,80107ED0,src/code/sys_cfb
-F7000,80107EE0,src/code/sys_math
-F7010,80107EF0,src/code/sys_math3d
-F70A0,80107F80,src/code/sys_math_atan
-F70B0,80107F90,src/code/sys_matrix
-F70E0,80107FC0,src/code/irqmgr
-F7100,80107FE0,src/code/fault
-F7B10,801089F0,src/code/fault_drawer
-F7F40,80108E20,src/audio/lib/synthesis
-F7F60,80108E40,src/audio/lib/heap
-F7F90,80108E70,src/audio/lib/load
-F8000,80108EE0,src/audio/lib/thread
-F8130,80109010,src/audio/lib/playback
-F8160,80109040,src/audio/lib/effects
-F8190,80109070,src/audio/lib/seqplayer
-F87D0,801096B0,src/audio/general
-F8960,80109840,src/audio/sfx
-F8980,80109860,src/audio/sequence
-F8A00,801098E0,src/audio/session_config
-F8A10,801098F0,src/code/gfxprint
-F8A30,80109910,src/code/fp_math
-F8A80,80109960,src/code/__osMalloc
-F8D40,80109C20,src/libultra/gu/sinf
-F8D90,80109C70,src/libultra/gu/perspective
-F8DA0,80109C80,src/libultra/gu/lookathil
-F8DB0,80109C90,src/libultra/libc/xprintf
-F8EB0,80109D90,src/libultra/gu/cosf
-F8F00,80109DE0,src/libultra/gu/libm_vals
-F8F10,80109DF0,src/libultra/libc/xldtob
-F8F70,80109E50,src/libultra/libc/llcvt
-
-offset,vram,.data
-F8F80,80109E60,src/code/z_message
-101910,801127F0,src/code/z_game_over
-
-offset,vram,.rodata
-101920,80112800,src/code/z_message
-101D40,80112C20,src/code/z_game_over
-101DA0,80112C80,data/audio_tables.rodata
-102940,80113820,data/rsp.rodata
-
-offset,vram,.bss
-104A60,80115940,src/code/z_en_item00
-104A70,80115950,src/code/z_effect
-108860,80119740,src/code/flg_set
-108870,80119750,src/code/z_actor
-1088F0,801197D0,src/code/z_actor_dlftbls
-108900,801197E0,src/code/z_bgcheck
-108A20,80119900,src/code/z_camera
-108B00,801199E0,src/code/z_collision_check
-10A260,8011B140,src/code/z_common_data
-10B690,8011C570,src/code/z_debug
-10B8B0,8011C790,src/code/z_debug_display
-10B8C0,8011C7A0,src/code/z_demo
-10B8F0,8011C7D0,src/code/z_kankyo
-10B9C0,8011C8A0,src/code/z_lifemeter
-10B9F0,8011C8D0,src/code/z_lights
-10BB80,8011CA60,src/code/z_malloc
-10BBB0,8011CA90,src/code/z_map_mark
-10BBC0,8011CAA0,src/code/z_map_exp
-10BBD0,8011CAB0,src/code/z_parameter
-10BBF0,8011CAD0,src/code/z_player_lib
-10BC10,8011CAF0,src/code/z_quake
-10BCA0,8011CB80,src/code/z_skelanime
-10BCB0,8011CB90,src/code/z_skin
-10CBC0,8011DAA0,src/code/z_rumble
-10CCD0,8011DBB0,src/code/z_vr_box_draw
-10CCE0,8011DBC0,src/code/z_player_call
-10CCF0,8011DBD0,src/code/db_camera
-10CCF0,8011DBD0,src/code/mempak
-10CCF0,8011DBD0,src/code/z_kaleido_scope_call
-10CD10,8011DBF0,src/code/z_play
-10CE20,8011DD00,src/code/game
-10CF00,8011DDE0,src/code/graph
-10CF70,8011DE50,src/code/main
-110E00,80121CE0,src/code/padmgr
-110E10,80121CF0,src/code/sched
-110E30,80121D10,src/code/speed_meter
-110EA0,80121D80,src/code/sys_cfb
-110EB0,80121D90,src/code/sys_math3d
-1110D0,80121FB0,src/code/sys_matrix
-1110E0,80121FC0,src/code/fault
-111F60,80122E40,src/code/fault_drawer
-111FC0,80122EA0,src/audio/lib/load
-112080,80122F60,src/audio/general
-112280,80123160,src/audio/sfx
-114A90,80125970,src/audio/sequence
-115850,80126730,src/audio/session_config
-11BD60,8012CC40,src/code/gfxprint
-11BD70,8012CC50,src/code/fp_math
-11BD80,8012CC60,src/code/system_malloc
-11BDB0,8012CC90,src/code/rand
-11BDC0,8012CCA0,src/code/__osMalloc
-11BDD0,8012CCB0,src/code/jpegdecoder
-11BDE0,8012CCC0,src/libultra/io/sptask
-11BE20,8012CD00,src/libultra/io/motor
-11BF20,8012CE00,src/libultra/io/siacs
-11BF40,8012CE20,src/libultra/io/controller
-11BFD0,8012CEB0,src/libultra/io/contpfs
-11C0D0,8012CFB0,src/libultra/io/pfsisplug
-11C110,8012CFF0,src/code/z_message
-11C130,8012D010,.end

tools/disasm/gc-us/files_ovl_file_choose.csv

@@ -1,22 +0,0 @@
-offset,vram,.text
-0,80803630,src/overlays/gamestates/ovl_file_choose/z_file_copy_erase
-3040,80806670,src/overlays/gamestates/ovl_file_choose/z_file_nameset
-8490,8080BAC0,src/overlays/gamestates/ovl_file_choose/z_file_choose
-
-offset,vram,.data
-EC40,80812270,src/overlays/gamestates/ovl_file_choose/z_file_nameset_data
-F320,80812950,src/overlays/gamestates/ovl_file_choose/z_file_copy_erase
-F360,80812990,src/overlays/gamestates/ovl_file_choose/z_file_nameset
-F500,80812B30,src/overlays/gamestates/ovl_file_choose/z_file_choose
-
-offset,vram,.rodata
-F7F0,80812E20,src/overlays/gamestates/ovl_file_choose/z_file_nameset
-F800,80812E30,src/overlays/gamestates/ovl_file_choose/z_file_choose
-
-offset,vram,.ovl
-F820,80812E50,src/overlays/gamestates/ovl_file_choose/ovl_file_choose_reloc
-
-offset,vram,.bss
-FF60,80813590,src/overlays/gamestates/ovl_file_choose/z_file_copy_erase
-FF70,808135A0,src/overlays/gamestates/ovl_file_choose/z_file_nameset
-FF80,808135B0,.end

tools/disasm/gc-us/files_ovl_kaleido_scope.csv

@@ -1,34 +0,0 @@
-offset,vram,.text
-0,808135B0,src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect
-2400,808159B0,src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug
-43B0,80817960,src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment
-5E30,808193E0,src/overlays/misc/ovl_kaleido_scope/z_kaleido_item
-7E20,8081B3D0,src/overlays/misc/ovl_kaleido_scope/z_kaleido_map
-B100,8081E6B0,src/overlays/misc/ovl_kaleido_scope/z_kaleido_prompt
-B300,8081E8B0,src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope
-152C0,80828870,src/overlays/misc/ovl_kaleido_scope/z_lmap_mark
-
-offset,vram,.data
-15980,80828F30,src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect
-15B30,808290E0,src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug
-15D00,808292B0,src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment
-15D30,808292E0,src/overlays/misc/ovl_kaleido_scope/z_kaleido_item
-15DA0,80829350,src/overlays/misc/ovl_kaleido_scope/z_kaleido_map
-15FF0,808295A0,src/overlays/misc/ovl_kaleido_scope/z_kaleido_prompt
-16000,808295B0,src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope
-169C0,80829F70,src/overlays/misc/ovl_kaleido_scope/z_lmap_mark
-16A10,80829FC0,src/overlays/misc/ovl_kaleido_scope/z_lmap_mark_data
-
-offset,vram,.rodata
-1AB70,8082E120,src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug
-1AC50,8082E200,src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment
-1AC60,8082E210,src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope
-1AF40,8082E4F0,src/overlays/misc/ovl_kaleido_scope/z_lmap_mark
-1AFF0,8082E5A0,src/overlays/misc/ovl_kaleido_scope/z_lmap_mark_data
-
-offset,vram,.ovl
-1B070,8082E620,src/overlays/misc/ovl_kaleido_scope/ovl_kaleido_scope_reloc
-
-offset,vram,.bss
-1C780,8082FD30,src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope
-1C7F0,8082FDA0,.end

tools/disasm/gc-us/variables.txt

@@ -1 +0,0 @@
-gSaveContext = 0x8011B148; // size:0x1428 type:SaveContext