From 9b59eb0256094992d94bd2e76972424621fd5264 Mon Sep 17 00:00:00 2001 From: Arceveti <73617174+Arceveti@users.noreply.github.com> Date: Thu, 23 Sep 2021 13:37:03 -0700 Subject: [PATCH] Code cleanup --- CHANGES | 38 +-- Makefile | 10 +- Makefile.split | 2 +- README.md | 18 +- actors/bowser/flames_data.inc.c | 184 ++++++------- actors/coin/model.inc.c | 2 +- assets/demo_data.json | 8 +- enhancements/README.md | 4 +- enhancements/crash.patch | 4 +- enhancements/debug_box.patch | 6 +- enhancements/fps.patch | 2 +- enhancements/instantinput.patch | 4 +- enhancements/ique_support.patch | 36 +-- enhancements/long-render-patch.diff | 20 +- enhancements/mem_error_screen.patch | 34 +-- enhancements/platform_displacement_2.diff | 82 +++--- enhancements/record_demo.patch | 6 +- enhancements/reonucam3.patch | 86 +++--- enhancements/wide.diff | 88 +++--- haveyourcake2.patch | 24 +- include/level_commands.h | 6 +- include/text_menu_strings.h.in | 2 +- levels/castle_inside/painting.inc.c | 2 +- levels/ending/leveldata.c | 2 +- levels/hmc/areas/1/painting.inc.c | 2 +- sm64.ld | 4 +- sound/sequences/00_sound_player.s | 4 +- src/audio/synthesis.c | 11 - src/boot/main.c | 26 +- src/boot/memory.c | 4 +- src/buffers/adpcmbuf.c | 10 +- src/buffers/hvqbuf.c | 10 +- src/buffers/hvqmwork.c | 8 +- src/engine/behavior_script.c | 6 +- src/engine/surface_load.c | 18 +- src/engine/surface_load.h | 3 - src/game/_Ldtob.c | 1 - src/game/behaviors/activated_bf_plat.inc.c | 2 - src/game/behaviors/bbh_tilting_trap.inc.c | 2 - .../behaviors/beta_fish_splash_spawner.inc.c | 3 +- src/game/behaviors/bird.inc.c | 1 - src/game/behaviors/blue_fish.inc.c | 34 +-- src/game/behaviors/boo_cage.inc.c | 2 - src/game/behaviors/bowser.inc.c | 18 +- .../behaviors/bowser_falling_platform.inc.c | 1 - src/game/behaviors/bowser_flame.inc.c | 5 +- src/game/behaviors/camera_lakitu.inc.c | 6 +- src/game/behaviors/cannon.inc.c | 2 - src/game/behaviors/capswitch.inc.c | 4 +- src/game/behaviors/castle_floor_trap.inc.c | 1 - src/game/behaviors/chain_chomp.inc.c | 2 +- src/game/behaviors/chuckya.inc.c | 6 - src/game/behaviors/collide_particles.inc.c | 2 - src/game/behaviors/door.inc.c | 2 +- src/game/behaviors/dorrie.inc.c | 4 +- src/game/behaviors/elevator.inc.c | 12 +- src/game/behaviors/exclamation_box.inc.c | 1 - src/game/behaviors/fish.inc.c | 10 +- src/game/behaviors/flamethrower.inc.c | 1 - src/game/behaviors/goomba.inc.c | 2 - src/game/behaviors/heave_ho.inc.c | 1 - src/game/behaviors/hoot.inc.c | 2 +- src/game/behaviors/intro_lakitu.inc.c | 3 - src/game/behaviors/king_bobomb.inc.c | 4 +- src/game/behaviors/klepto.inc.c | 2 - src/game/behaviors/koopa.inc.c | 4 +- src/game/behaviors/koopa_shell.inc.c | 1 - src/game/behaviors/lll_hexagonal_ring.inc.c | 1 - src/game/behaviors/lll_volcano_flames.inc.c | 2 +- src/game/behaviors/manta_ray.inc.c | 18 +- src/game/behaviors/metal_box.inc.c | 1 - src/game/behaviors/piranha_bubbles.inc.c | 1 - src/game/behaviors/purple_switch.inc.c | 1 - src/game/behaviors/racing_penguin.inc.c | 2 +- src/game/behaviors/scuttlebug.inc.c | 1 - src/game/behaviors/seesaw_platform.inc.c | 1 - src/game/behaviors/sl_snowman_wind.inc.c | 11 +- src/game/behaviors/sl_walking_penguin.inc.c | 30 +- src/game/behaviors/snufit.inc.c | 8 +- src/game/behaviors/star_door.inc.c | 1 - src/game/behaviors/strong_wind_particle.inc.c | 12 +- .../behaviors/tilting_inverted_pyramid.inc.c | 6 +- src/game/behaviors/tower_platform.inc.c | 1 - src/game/behaviors/tree_particles.inc.c | 2 - src/game/behaviors/tuxie.inc.c | 4 +- src/game/behaviors/tweester.inc.c | 8 +- src/game/behaviors/ukiki.inc.c | 6 +- .../behaviors/water_splashes_and_waves.inc.c | 1 - src/game/behaviors/whomp.inc.c | 4 +- src/game/behaviors/wiggler.inc.c | 2 +- src/game/camera.c | 202 +------------- src/game/debug.c | 43 +-- src/game/game_init.c | 3 - src/game/hud.c | 8 - src/game/ingame_menu.c | 8 +- src/game/interaction.c | 8 +- src/game/level_update.c | 6 - src/game/level_update.h | 2 - src/game/macro_special_objects.c | 4 - src/game/mario_actions_airborne.c | 2 - src/game/mario_actions_automatic.c | 10 +- src/game/mario_actions_cutscene.c | 1 - src/game/mario_actions_moving.c | 2 - src/game/mario_actions_submerged.c | 3 +- src/game/mario_misc.c | 2 - src/game/moving_texture.c | 1 - src/game/nupiinitsram.c | 8 +- src/game/nupireadwritesram.c | 2 +- src/game/obj_behaviors_2.c | 1 - src/game/object_helpers.c | 6 +- src/game/object_list_processor.c | 5 - src/game/object_list_processor.h | 1 - src/game/paintings.c | 1 - src/game/platform_displacement.c | 4 - src/game/print.c | 2 - src/game/rendering_graph_node.c | 1 - src/game/sram.h | 4 +- src/game/vc_check.h | 2 +- src/goddard/debug_utils.c | 2 - src/goddard/draw_objects.c | 43 +-- src/goddard/dynlist_proc.c | 6 +- src/goddard/dynlists/dynlist_macros.h | 4 +- src/goddard/dynlists/dynlist_mario_face.c | 4 +- src/goddard/dynlists/dynlist_mario_master.c | 2 +- src/goddard/gd_macros.h | 2 +- src/goddard/gd_math.c | 17 +- src/goddard/gd_math.h | 2 +- src/goddard/gd_types.h | 4 +- src/goddard/joints.c | 2 - src/goddard/particles.c | 8 - src/goddard/renderer.c | 3 - src/goddard/shape_helper.c | 2 +- src/goddard/skin.c | 2 - src/hvqm/cfbkeep.c | 8 +- src/hvqm/getrecord.c | 22 +- src/hvqm/hvqm.c | 56 ++-- src/hvqm/hvqm.h | 4 +- src/hvqm/system.c | 16 +- src/hvqm/timekeeper.c | 54 ++-- src/libz/gzip.c | 2 +- src/menu/file_select.c | 3 - src/s2d_engine/fonts/comicsans.c | 256 +++++++++--------- src/s2d_engine/fonts/delfino.c | 256 +++++++++--------- src/s2d_engine/fonts/impact.c | 256 +++++++++--------- src/s2d_engine/fonts/papyrus.c | 256 +++++++++--------- src/s2d_engine/fonts/timesnewroman.c | 256 +++++++++--------- src/s2d_engine/fonts/ubuntu.c | 256 +++++++++--------- src/s2d_engine/x86_testing_ground/atoi.c | 8 +- src/usb/debug.c | 254 ++++++++--------- src/usb/debug.h | 84 +++--- src/usb/usb.c | 192 ++++++------- src/usb/usb.h | 62 ++--- tools/clang-tidy.sh | 10 +- tools/create_patch.sh | 2 +- tools/demo_data_converter.py | 2 +- tools/extract_data_for_mio.c | 2 +- tools/n64graphics_ci_dir/README.md | 2 +- tools/patch_elf_32bit.c | 2 +- tools/skyconv.c | 6 +- tools/slienc.c | 30 +- tools/stb/stb_image.h | 144 +++++----- tools/stb/stb_image_write.h | 56 ++-- tools/util/audiofile_strip.patch | 14 +- 163 files changed, 1806 insertions(+), 2251 deletions(-) diff --git a/CHANGES b/CHANGES index 4713fe88..9c468cba 100644 --- a/CHANGES +++ b/CHANGES @@ -264,12 +264,12 @@ Refresh #7 38.) Fix BBH texture (#908) Refresh #6 -1.) Make tools work on MinGW (#804) -2.) Document mario_misc (#628) -3.) add patch_libmalloc.py script to work around compiler crashes (#811) -4.) Label the coffins file. (#829) -5.) Convert enhancements into patches (#827) -6.) Document Tweester.inc.c (#840) +1.) Make tools work on MinGW (#804) +2.) Document mario_misc (#628) +3.) add patch_libmalloc.py script to work around compiler crashes (#811) +4.) Label the coffins file. (#829) +5.) Convert enhancements into patches (#827) +6.) Document Tweester.inc.c (#840) 7.) EU OK and cleanup EU (#782) Refresh #5 @@ -300,21 +300,21 @@ Refresh #4 10.) Very minor white space fixes in Mario.c (#752) 11.) Renamed GRAVITY to OBJ_PHYSICS (#755) 12.) Use defined macros instead of literal values for interactions in behavior_data.c (#754) -13.) iQue Player console detection + full support (#756) -14.) Fix Goddard Mario head for little endian etc. (#757) +13.) iQue Player console detection + full support (#756) +14.) Fix Goddard Mario head for little endian etc. (#757) 15.) Small bits of audio doc (#749) -16.) Update diff script (#750) -17.) Nicer format for course/dialog text, enum for dialog IDs (#753) +16.) Update diff script (#750) +17.) Nicer format for course/dialog text, enum for dialog IDs (#753) 18.) first-diff: store most recent mtime during check (#759) 19.) Use Lights1 struct for light values (#760) -20.) Detect mips64-elf in diff.py (#761) -21.) Name display lists in gd renderer.c (#764) -22.) Document a variety of PU type crashes. (#765) -23.) Label object_behaviors. (#716) -24.) Update swoop.inc.c (#767) -25.) Label tilting_pyramid.inc.c (#768) -26.) Label red_coin.inc.c (#770) -27.) Use more level defines (#758) +20.) Detect mips64-elf in diff.py (#761) +21.) Name display lists in gd renderer.c (#764) +22.) Document a variety of PU type crashes. (#765) +23.) Label object_behaviors. (#716) +24.) Update swoop.inc.c (#767) +25.) Label tilting_pyramid.inc.c (#768) +26.) Label red_coin.inc.c (#770) +27.) Use more level defines (#758) 28.) Named Mario actions 6, 7, and 8 and noted causes of hands-free holding glitch (#769) Refresh #3 @@ -360,7 +360,7 @@ Changes from Refresh #1: 6.) Merge ucode.bin and ucode_unk.bin 7.) 64-bit fixes 8.) [AUDIO] Match func_80316928 -9.) Documented bug in Tuxie's mother's code +9.) Documented bug in Tuxie's mother's code 10.) [AUDIO] Slightly closer matching for process_level_music_dynamics 11.) Name channel scripts in sequence 0 12.) Nicer error message when sha1sum doesn't match diff --git a/Makefile b/Makefile index 4a3447ff..47259e2e 100644 --- a/Makefile +++ b/Makefile @@ -192,7 +192,7 @@ endif # UNF - whether to use UNFLoader flashcart library # 1 - includes code in ROM -# 0 - does not +# 0 - does not UNF ?= 0 $(eval $(call validate-option,UNF,0 1)) ifeq ($(UNF),1) @@ -204,7 +204,7 @@ endif # ISVPRINT - whether to fake IS-Viewer presence, # allowing for usage of CEN64 (and possibly Project64) to print messages to terminal. # 1 - includes code in ROM -# 0 - does not +# 0 - does not ISVPRINT ?= 0 $(eval $(call validate-option,ISVPRINT,0 1)) ifeq ($(ISVPRINT),1) @@ -222,7 +222,7 @@ endif # HVQM - whether to use HVQM fmv library # 1 - includes code in ROM -# 0 - does not +# 0 - does not HVQM ?= 0 $(eval $(call validate-option,HVQM,0 1)) ifeq ($(HVQM),1) @@ -232,7 +232,7 @@ endif # GODDARD - whether to use libgoddard (Mario Head) # 1 - includes code in ROM -# 0 - does not +# 0 - does not GODDARD ?= 0 $(eval $(call validate-option,GODDARD,0 1)) ifeq ($(GODDARD),1) @@ -476,7 +476,7 @@ else endif ENDIAN_BITWIDTH := $(BUILD_DIR)/endian-and-bitwidth EMULATOR = ~/Downloads/mupen64plus/mupen64plus-gui -EMU_FLAGS = +EMU_FLAGS = LOADER = loader64 LOADER_FLAGS = -vwf SHA1SUM = sha1sum diff --git a/Makefile.split b/Makefile.split index 43c08655..02925fee 100644 --- a/Makefile.split +++ b/Makefile.split @@ -152,7 +152,7 @@ $(BUILD_DIR)/levels/%/leveldata.elf: SEGMENT_ADDRESS := 0x07000000 # TODO: Generate these rules from the level configs? -define level_rules = +define level_rules = $(1)_SEG7_FILES := $$(patsubst %.png,%.inc.c,$$(wildcard levels/$(1)/*.png)) $$(BUILD_DIR)/levels/$(1)/leveldata.o: $$(addprefix $$(BUILD_DIR)/,$$($(1)_SEG7_FILES)) $$(BUILD_DIR)/levels/$(1)/leveldata.elf: TEXTURE_BIN := $(2) diff --git a/README.md b/README.md index 0394a236..de012fd2 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ This repo needs BOTH an US ROM and a JP ROM in order to build. Place baserom.us. This repo needs gcc in order to be able to build it. To install it, run `sudo apt install gcc-mips-linux-gnu` -This is a fork of the ultrasm64 repo by CrashOveride which includes the following commonly used patches (patches marked with `*` are toggleable in `config.h`): +This is a fork of the ultrasm64 repo by CrashOveride which includes the following commonly used patches (patches marked with `*` are toggleable in `config.h`): **Lighting Engine by Wiseguy** - Lighting Engine is available on a separate branch `(lighting-engine)`. Instructions on how to use it are in the readme of that branch. @@ -18,9 +18,9 @@ This is a fork of the ultrasm64 repo by CrashOveride which includes the followin **Collision:** - Slope fix and exposed ceilings fix -- No false ledgegrabs fix * -- Jump kick fix * -- 46 degree wallkicks * +- No false ledgegrabs fix * +- Jump kick fix * +- 46 degree wallkicks * - Pole fix - Possibility of disabling BLJs * - Hanging fix (mario can grab hangable ceilings from any state, instead of only jump or double jump) * @@ -51,12 +51,12 @@ This is a fork of the ultrasm64 repo by CrashOveride which includes the followin - Automatic console/emulator detection. If emulator is detected, LODs are disabled. * - Ability to configure whether there's a 100 coin star at all and how many coins are required to spawn it * - Ability to easily change the warp that EXIT COURSE takes you to via config.h, or disable it entirely. * -- 16 bit model IDs by someone2639. This means you can have up to 65536 models (lol). You can set the maximum number of model IDs in `config.h`. +- 16 bit model IDs by someone2639. This means you can have up to 65536 models (lol). You can set the maximum number of model IDs in `config.h`. - Apply_patch.sh improved - Removed the ifdef hell in `file_select.c` and `ingame_menu.c` - Added Blake's custom function for object model stuff: `obj_set_model` and `obj_has_model` - Added function to get the model ID from an object: `obj_get_model_id` (by Arceveti) -- The "far" variable is now u16, allowing you to increase the farclip (the max distance at which geometry is rendered). However, when increasing the farclip, make sure to increase the nearclip by the same ratio, or rendering will break on console and LLE plugins. +- The "far" variable is now u16, allowing you to increase the farclip (the max distance at which geometry is rendered). However, when increasing the farclip, make sure to increase the nearclip by the same ratio, or rendering will break on console and LLE plugins. - Many general use defines for object struct members, meant for use in custom object behaviors. Check `object_fields.h` for more info on this. (By MrComit) - Included `actors/group0.c` in `behavior_data.c` - The internal ROM name is now set with a define in `config.h` to make it simpler @@ -91,7 +91,7 @@ This is a fork of the ultrasm64 repo by CrashOveride which includes the followin - You can set the black border size to different values for console and emulator. It's set to 0 by default for both. * - This repo supports much better implementation of reverb over vanilla's fake echo reverb. Great for caves or eerie levels, as well as just a better audio experience in general. See `audio/synthesis.c` for more configuration info. (By ArcticJaguar725) * - Fazana's "puppyprint" text engine. * - - Use `print_small_text` to print normal text. The two last params are aligment and how many characters to print (-1 means PRINT_ALL). + - Use `print_small_text` to print normal text. The two last params are aligment and how many characters to print (-1 means PRINT_ALL). - Use `render_multi_image` to draw large texture rectangles consisting of multiple images on the screen. - More info in `puppyprint.c` - Wiseguy's Farcall TLB mapping allows to store executable code inside uncompressed segments, that can be loaded and ran as needed, instead of it having to be loaded at all times. See `farcall.h` in the include folder for instructions and details. @@ -119,7 +119,7 @@ Requirements are the same as regular SM64, however a GCC MIPS cross compiler is BinPNG (the CI texture converter) requires some python3 dependencies. Use pip to install them. -``pip install pypng bitstring`` +``pip install pypng bitstring`` ## UNFLoader support @@ -142,7 +142,7 @@ To target iQue, run make with the ``CONSOLE=bb`` argument. ## Compression -The repo also supports RNC (Rob Northen Compression). RNC has two methods. +The repo also supports RNC (Rob Northen Compression). RNC has two methods. Method 1 is designed to compress as small as possible, while method 2 is designed so that decompression is as fast as possible. diff --git a/actors/bowser/flames_data.inc.c b/actors/bowser/flames_data.inc.c index 1ba334ab..23e3a075 100644 --- a/actors/bowser/flames_data.inc.c +++ b/actors/bowser/flames_data.inc.c @@ -2,97 +2,97 @@ const s16 dBowserFlamesOrientationValues[] = { // posX, posY, posZ, rotY, rotX - 0, 280, 80, 0x00E9, 0x1A96, - 0, 278, 83, 0x00EC, 0x1C7F, - 0, 273, 92, 0x00F9, 0x20BF, - 0, 268, 102, 0x010F, 0x2519, - 0, 263, 109, 0x011D, 0x2751, - 0, 263, 110, 0x011C, 0x2714, - 0, 265, 106, 0x0112, 0x2601, - 0, 268, 102, 0x0109, 0x24C0, - 0, 271, 96, 0x00FF, 0x2358, - 0, 274, 90, 0x00F7, 0x21CB, - 0, 277, 84, 0x00EE, 0x201C, - 0, 280, 78, 0x00E7, 0x1E4E, - 0, 284, 71, 0x00DF, 0x1C64, - 0, 288, 63, 0x00D9, 0x1A61, - 0, 291, 56, 0x00D3, 0x184B, - 0, 295, 48, 0x00CF, 0x1622, - 0, 298, 40, 0x00CA, 0x13E9, - 0, 301, 32, 0x00C7, 0x11A5, - 0, 304, 23, 0x00C4, 0x0F59, - 0, 308, 15, 0x00C1, 0x0D08, - 0, 311, 7, 0x00C0, 0x0AB5, - 0, 313, 0, 0x00C0, 0x0863, - 0, 315, -8, 0x00BF, 0x0615, - 0, 317, -15, 0x00CE, 0x03A3, - 0, 319, -22, 0x00F8, 0x00ED, - 0, 320, -29, 0x0131, 0xFFFF, - 0, 322, -36, 0x0172, 0xFFFF, - 0, 322, -40, 0x01B5, 0xFFFF, - 0, 323, -45, 0x01ED, 0xFFFF, - 0, 323, -48, 0x0213, 0xFFFF, - 0, 323, -51, 0x0219, 0xFFFF, - 0, 323, -52, 0x01F2, 0xFFFF, - 0, 323, -51, 0x018F, 0xFFFF, - 0, 323, -49, 0x00E5, 0xFFFF, - 0, 322, -45, 0xFFFF, 0xFFFF, - 0, 320, -35, 0xFFFF, 0xFFFF, - 0, 317, -23, 0xFFFF, 0xFFFF, - 0, 312, -7, 0xFFFF, 0xFFFF, - 0, 306, 11, 0xFFFF, 0xFFFF, - 0, 299, 31, 0xFFFF, 0xFFFF, - 0, 288, 51, 0xFFFF, 0xFFFF, - 0, 278, 70, 0xFFFF, 0xFFFF, - 0, 267, 89, 0xFFFF, 0xFFFF, - 0, 256, 106, 0xFFFF, 0x023A, - 0, 244, 120, 0xFFFF, 0x04AA, - 0, 236, 132, 0xFFFF, 0x069F, - 0, 229, 139, 0xFFFF, 0x0803, - 0, 224, 144, 0xFFFF, 0x08C0, - 0, 222, 147, 0xFFFF, 0x0928, - 0, 221, 148, 0xFFFF, 0x099D, - 0, 221, 149, 0xFFFF, 0x0A16, - 0, 221, 150, 0xFFFF, 0x0A8D, - 0, 221, 150, 0xFFFF, 0x0AF6, - 0, 222, 150, 0xFFFF, 0x0B4A, - 0, 222, 150, 0xFFFF, 0x0B84, - 0, 222, 149, 0x020A, 0x0BA0, - 0, 223, 149, 0x0524, 0x0B9E, - 0, 225, 148, 0x07EC, 0x0B84, - 0, 226, 147, 0x0A3F, 0x0B57, - 0, 227, 145, 0x0BFB, 0x0B1F, - 0, 228, 144, 0x0D00, 0x0AE5, - 0, 230, 142, 0x0D6F, 0x0AA0, - 0, 232, 140, 0x0D8B, 0x0A48, - 0, 233, 138, 0x0D5D, 0x09DE, - 0, 236, 136, 0x0CED, 0x096A, - 0, 238, 134, 0x0C49, 0x08EA, - 0, 239, 132, 0x0B76, 0x0863, - 0, 241, 130, 0x0A80, 0x07D9, - 0, 244, 128, 0x0970, 0x074E, - 0, 246, 125, 0x084E, 0x06C7, - 0, 248, 122, 0x0723, 0x0649, - 0, 251, 120, 0x05F8, 0x05D7, - 0, 253, 117, 0x04D6, 0x0579, - 0, 254, 114, 0x03C3, 0x0532, - 0, 256, 111, 0x02C9, 0x0509, - 0, 259, 108, 0x01F0, 0x0504, - 0, 261, 105, 0x0141, 0x0525, - 0, 262, 103, 0x00C3, 0x0572, - 0, 264, 100, 0x006E, 0x0619, - 0, 267, 97, 0x0032, 0x0734, - 0, 268, 95, 0x000C, 0x08AF, - 0, 269, 93, 0xFFFF, 0x0A74, - 0, 272, 90, 0xFFFF, 0x0C70, - 0, 273, 88, 0xFFFF, 0x0E8E, - 0, 274, 86, 0x0014, 0x10B6, - 0, 275, 84, 0x0032, 0x12DA, - 0, 277, 82, 0x0056, 0x14E1, - 0, 277, 82, 0x007E, 0x16B9, - 0, 278, 80, 0x00A4, 0x184B, - 0, 278, 80, 0x00C6, 0x1983, - 0, 279, 80, 0x00DF, 0x1A4D, - 0, 280, 80, 0x00E9, 0x1A96, + 0, 280, 80, 0x00E9, 0x1A96, + 0, 278, 83, 0x00EC, 0x1C7F, + 0, 273, 92, 0x00F9, 0x20BF, + 0, 268, 102, 0x010F, 0x2519, + 0, 263, 109, 0x011D, 0x2751, + 0, 263, 110, 0x011C, 0x2714, + 0, 265, 106, 0x0112, 0x2601, + 0, 268, 102, 0x0109, 0x24C0, + 0, 271, 96, 0x00FF, 0x2358, + 0, 274, 90, 0x00F7, 0x21CB, + 0, 277, 84, 0x00EE, 0x201C, + 0, 280, 78, 0x00E7, 0x1E4E, + 0, 284, 71, 0x00DF, 0x1C64, + 0, 288, 63, 0x00D9, 0x1A61, + 0, 291, 56, 0x00D3, 0x184B, + 0, 295, 48, 0x00CF, 0x1622, + 0, 298, 40, 0x00CA, 0x13E9, + 0, 301, 32, 0x00C7, 0x11A5, + 0, 304, 23, 0x00C4, 0x0F59, + 0, 308, 15, 0x00C1, 0x0D08, + 0, 311, 7, 0x00C0, 0x0AB5, + 0, 313, 0, 0x00C0, 0x0863, + 0, 315, -8, 0x00BF, 0x0615, + 0, 317, -15, 0x00CE, 0x03A3, + 0, 319, -22, 0x00F8, 0x00ED, + 0, 320, -29, 0x0131, 0xFFFF, + 0, 322, -36, 0x0172, 0xFFFF, + 0, 322, -40, 0x01B5, 0xFFFF, + 0, 323, -45, 0x01ED, 0xFFFF, + 0, 323, -48, 0x0213, 0xFFFF, + 0, 323, -51, 0x0219, 0xFFFF, + 0, 323, -52, 0x01F2, 0xFFFF, + 0, 323, -51, 0x018F, 0xFFFF, + 0, 323, -49, 0x00E5, 0xFFFF, + 0, 322, -45, 0xFFFF, 0xFFFF, + 0, 320, -35, 0xFFFF, 0xFFFF, + 0, 317, -23, 0xFFFF, 0xFFFF, + 0, 312, -7, 0xFFFF, 0xFFFF, + 0, 306, 11, 0xFFFF, 0xFFFF, + 0, 299, 31, 0xFFFF, 0xFFFF, + 0, 288, 51, 0xFFFF, 0xFFFF, + 0, 278, 70, 0xFFFF, 0xFFFF, + 0, 267, 89, 0xFFFF, 0xFFFF, + 0, 256, 106, 0xFFFF, 0x023A, + 0, 244, 120, 0xFFFF, 0x04AA, + 0, 236, 132, 0xFFFF, 0x069F, + 0, 229, 139, 0xFFFF, 0x0803, + 0, 224, 144, 0xFFFF, 0x08C0, + 0, 222, 147, 0xFFFF, 0x0928, + 0, 221, 148, 0xFFFF, 0x099D, + 0, 221, 149, 0xFFFF, 0x0A16, + 0, 221, 150, 0xFFFF, 0x0A8D, + 0, 221, 150, 0xFFFF, 0x0AF6, + 0, 222, 150, 0xFFFF, 0x0B4A, + 0, 222, 150, 0xFFFF, 0x0B84, + 0, 222, 149, 0x020A, 0x0BA0, + 0, 223, 149, 0x0524, 0x0B9E, + 0, 225, 148, 0x07EC, 0x0B84, + 0, 226, 147, 0x0A3F, 0x0B57, + 0, 227, 145, 0x0BFB, 0x0B1F, + 0, 228, 144, 0x0D00, 0x0AE5, + 0, 230, 142, 0x0D6F, 0x0AA0, + 0, 232, 140, 0x0D8B, 0x0A48, + 0, 233, 138, 0x0D5D, 0x09DE, + 0, 236, 136, 0x0CED, 0x096A, + 0, 238, 134, 0x0C49, 0x08EA, + 0, 239, 132, 0x0B76, 0x0863, + 0, 241, 130, 0x0A80, 0x07D9, + 0, 244, 128, 0x0970, 0x074E, + 0, 246, 125, 0x084E, 0x06C7, + 0, 248, 122, 0x0723, 0x0649, + 0, 251, 120, 0x05F8, 0x05D7, + 0, 253, 117, 0x04D6, 0x0579, + 0, 254, 114, 0x03C3, 0x0532, + 0, 256, 111, 0x02C9, 0x0509, + 0, 259, 108, 0x01F0, 0x0504, + 0, 261, 105, 0x0141, 0x0525, + 0, 262, 103, 0x00C3, 0x0572, + 0, 264, 100, 0x006E, 0x0619, + 0, 267, 97, 0x0032, 0x0734, + 0, 268, 95, 0x000C, 0x08AF, + 0, 269, 93, 0xFFFF, 0x0A74, + 0, 272, 90, 0xFFFF, 0x0C70, + 0, 273, 88, 0xFFFF, 0x0E8E, + 0, 274, 86, 0x0014, 0x10B6, + 0, 275, 84, 0x0032, 0x12DA, + 0, 277, 82, 0x0056, 0x14E1, + 0, 277, 82, 0x007E, 0x16B9, + 0, 278, 80, 0x00A4, 0x184B, + 0, 278, 80, 0x00C6, 0x1983, + 0, 279, 80, 0x00DF, 0x1A4D, + 0, 280, 80, 0x00E9, 0x1A96, 0, 0, 0, 0x0000, 0x0000, }; diff --git a/actors/coin/model.inc.c b/actors/coin/model.inc.c index 032e19c0..77fdc5f8 100644 --- a/actors/coin/model.inc.c +++ b/actors/coin/model.inc.c @@ -106,7 +106,7 @@ const Gfx coin_seg3_dl_03007780[] = { gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), gsDPSetTile(G_IM_FMT_IA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD), gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC), -#endif +#endif gsSPEndDisplayList(), }; diff --git a/assets/demo_data.json b/assets/demo_data.json index 3652b490..a5153fdf 100644 --- a/assets/demo_data.json +++ b/assets/demo_data.json @@ -20,11 +20,11 @@ { "table": [ {"demofile":"bitdw", "ifdef":["VERSION_US", "VERSION_SH"]}, - + /* Whomp's Fortress has the wrong size. The original entries probably manually input the sizes. */ {"demofile":"wf", "extraSize":368}, - + {"demofile":"ccm"}, {"demofile":"bbh"}, {"demofile":"jrb"}, @@ -38,12 +38,12 @@ {"name":"jrb"}, {"name":"wf"}, {"name":"pss"}, - + /* Might be an unused demo, but it doesn't define a header, so it can't be normally called. Speculation: "blooper" take for CCM. Mario runs into the sign and aligns himself as if it were a mistake. */ {"name":"unused"}, - + {"name":"bitdw", "ifdef":["VERSION_US", "VERSION_SH"]} ] } diff --git a/enhancements/README.md b/enhancements/README.md index 241d82f3..50405715 100644 --- a/enhancements/README.md +++ b/enhancements/README.md @@ -8,10 +8,10 @@ To apply a patch, run `tools/apply_patch.sh [patch]` where `[patch]` is the name to the source code. Likewise, to undo the changes from a patch you applied, run -`tools/revert_patch.sh` with the name of the .patch file you wish to undo. +`tools/revert_patch.sh` with the name of the .patch file you wish to undo. To create your own enhancement patch, switch to the `master` Git -branch, make your changes to the code (but do not commit), then run `tools/create_patch.sh`. Your changes will be stored in the .patch file you specify. +branch, make your changes to the code (but do not commit), then run `tools/create_patch.sh`. Your changes will be stored in the .patch file you specify. The following enhancements are included in this directory: diff --git a/enhancements/crash.patch b/enhancements/crash.patch index 87c5c8f9..e3935d6b 100644 --- a/enhancements/crash.patch +++ b/enhancements/crash.patch @@ -163,7 +163,7 @@ index c3b97993..c552a485 100644 +++ b/lib/asm/__osExceptionPreamble.s @@ -11,8 +11,8 @@ #endif - + glabel __osExceptionPreamble - lui $k0, %hi(__osException) - addiu $k0, %lo(__osException) @@ -171,7 +171,7 @@ index c3b97993..c552a485 100644 + addiu $k0, %lo(__crash_handler_entry) jr $k0 nop - + diff --git a/sm64.ld b/sm64.ld index 7d9b5b4a..c7bb81b9 100755 --- a/sm64.ld diff --git a/enhancements/debug_box.patch b/enhancements/debug_box.patch index 4dacd2be..088c96b4 100644 --- a/enhancements/debug_box.patch +++ b/enhancements/debug_box.patch @@ -7,17 +7,17 @@ index af9d0156..c68a7f6e 100644 #include "level_table.h" #include "dialog_ids.h" +#include "debug_box.h" - + struct SpawnInfo gPlayerSpawnInfos[1]; struct GraphNode *gGraphNodePointers[0x100]; @@ -363,6 +364,8 @@ void render_game(void) { if (gCurrentArea != NULL && !gWarpTransition.pauseRendering) { geo_process_root(gCurrentArea->unk04, D_8032CE74, D_8032CE78, gFBSetColor); - + + render_debug_boxes(); + gSPViewport(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&D_8032CF00)); - + gDPSetScissor(gDisplayListHead++, G_SC_NON_INTERLACE, 0, BORDER_HEIGHT, SCREEN_WIDTH, diff --git a/src/game/debug_box.c b/src/game/debug_box.c new file mode 100644 diff --git a/enhancements/fps.patch b/enhancements/fps.patch index e5e1acca..d34dea29 100644 --- a/enhancements/fps.patch +++ b/enhancements/fps.patch @@ -5,7 +5,7 @@ index b961ca52..531231cf 100644 @@ -82,6 +82,47 @@ struct DemoInput gRecordedDemoInput = { 0 }; // Display // ---------------------------------------------------------------------------------------------------- - + +// SDK states that 1 cycle takes about 21.33 nanoseconds +#define SECONDS_PER_CYCLE 0.00000002133f + diff --git a/enhancements/instantinput.patch b/enhancements/instantinput.patch index 9cc01b3f..f0b161fd 100644 --- a/enhancements/instantinput.patch +++ b/enhancements/instantinput.patch @@ -5,7 +5,7 @@ index b633468..da65e01 100644 @@ -300,7 +300,10 @@ void rendering_init(void) { end_master_display_list(); send_display_list(&gGfxPool->spTask); - + - frameBufferIndex++; + // Skip incrementing the initial framebuffer index on emulators so that they display immediately as the Gfx task finishes + if ((*(volatile u32 *)0xA4100010) != 0) { // Read RDP Clock Register, has a value of zero on emulators @@ -13,7 +13,7 @@ index b633468..da65e01 100644 + } gGlobalTimer++; } - + @@ -326,11 +329,14 @@ void display_and_vsync(void) { osViSwapBuffer((void *) PHYSICAL_TO_VIRTUAL(gPhysicalFrameBuffers[sCurrFBNum])); profiler_log_thread5_time(THREAD5_END); diff --git a/enhancements/ique_support.patch b/enhancements/ique_support.patch index 8487c48e..b0192ded 100644 --- a/enhancements/ique_support.patch +++ b/enhancements/ique_support.patch @@ -75,12 +75,12 @@ index d550b846..bbaf2bcc 100644 @@ -1,4 +1,5 @@ #include "libultra_internal.h" +#include - + // TODO: merge with osEepromWrite typedef struct { @@ -13,11 +14,23 @@ s32 osEepromProbe(OSMesgQueue *mq) { unkStruct sp18; - + __osSiGetAccess(); - status = __osEepStatus(mq, &sp18); - if (status == 0 && (sp18.unk00 & 0x8000) != 0) { @@ -114,9 +114,9 @@ index ea784b2c..116dae2d 100644 @@ -1,4 +1,5 @@ #include "libultra_internal.h" +#include - + extern u8 _osLastSentSiCmd; - + @@ -42,33 +43,44 @@ s32 osEepromRead(OSMesgQueue *mq, u8 address, u8 *buffer) { return -1; } @@ -126,7 +126,7 @@ index ea784b2c..116dae2d 100644 + if (gConsoleType == CONSOLE_N64) { + sp34 = __osEepStatus(mq, &sp28); + if (sp34 != 0 || sp28.unk00 != 0x8000) { - + - return 8; - } - while (sp28.unk02 & 0x80) { @@ -195,46 +195,46 @@ index 1a86477b..a94f8721 100644 #include "libultra_internal.h" #include "osContInternal.h" +#include - + #ifndef AVOID_UB ALIGNED8 u32 D_80365E00[15]; @@ -52,36 +53,47 @@ s32 osEepromWrite(OSMesgQueue *mq, u8 address, u8 *buffer) { } - + __osSiGetAccess(); - sp34 = __osEepStatus(mq, &sp1c); + if (gConsoleType == CONSOLE_N64) { + sp34 = __osEepStatus(mq, &sp1c); - + - if (sp34 != 0 || sp1c.unk00 != 0x8000) { - return 8; - } + if (sp34 != 0 || sp1c.unk00 != 0x8000) { + return 8; + } - + - while (sp1c.unk02 & 0x80) { - __osEepStatus(mq, &sp1c); - } + while (sp1c.unk02 & 0x80) { + __osEepStatus(mq, &sp1c); + } - + - __osPackEepWriteData(address, buffer); + __osPackEepWriteData(address, buffer); - + - sp34 = __osSiRawStartDma(OS_WRITE, &D_80365E00); - osRecvMesg(mq, NULL, OS_MESG_BLOCK); + sp34 = __osSiRawStartDma(OS_WRITE, &D_80365E00); + osRecvMesg(mq, NULL, OS_MESG_BLOCK); - + - for (sp30 = 0; sp30 < 0x10; sp30++) { - (D_80365E00)[sp30] = 255; - } + for (sp30 = 0; sp30 < 0x10; sp30++) { + (D_80365E00)[sp30] = 255; + } - + - D_80365E3C = 0; - sp34 = __osSiRawStartDma(OS_READ, D_80365E00); - _osLastSentSiCmd = 5; @@ -243,7 +243,7 @@ index 1a86477b..a94f8721 100644 + sp34 = __osSiRawStartDma(OS_READ, D_80365E00); + _osLastSentSiCmd = 5; + osRecvMesg(mq, NULL, OS_MESG_BLOCK); - + - for (sp30 = 0; sp30 < 4; sp30++) { - sp2c++; - } @@ -256,7 +256,7 @@ index 1a86477b..a94f8721 100644 + } else if (gConsoleType == CONSOLE_IQUE) { + u8 *__osBbEepromAddress = * (u8**) 0x8000035C; + s32 i; - + - sp20 = *(unkStruct2 *) sp2c; - sp34 = (sp20.unk01 & 0xc0) >> 4; + for (i = 0; i < 8; i++) { @@ -277,9 +277,9 @@ index ba73024b..6deaf407 100644 #include "hardware.h" #include +#include - + #define PIF_ADDR_START (void *) 0x1FC007FC - + @@ -51,6 +52,7 @@ void osInitialize(void) { UNUSED u32 eu_sp30; #endif @@ -309,4 +309,4 @@ index 7d9b5b4a..be853a3b 100755 + BUILD_DIR/libultra.a:skGetId.o(.text) BUILD_DIR/lib/rsp.o(.text); #endif - + diff --git a/enhancements/long-render-patch.diff b/enhancements/long-render-patch.diff index dd72a4eb..bbb445f0 100644 --- a/enhancements/long-render-patch.diff +++ b/enhancements/long-render-patch.diff @@ -25,7 +25,7 @@ index e5d59d8b5..75cd43a09 100644 -#endif + Mat4 temp; + register s32 i, j; -+ ++ + for( i = 0; i < 4; i++ ) { + for( j = 0; j < 3; j++ ) { + temp[i][j] = src[i][j] / WORLD_SCALE; @@ -35,19 +35,19 @@ index e5d59d8b5..75cd43a09 100644 + + guMtxF2L( temp, dest ); } - + /** diff --git a/src/engine/math_util.h b/src/engine/math_util.h index cb37d52d1..0826a8407 100644 --- a/src/engine/math_util.h +++ b/src/engine/math_util.h @@ -5,6 +5,14 @@ - + #include "types.h" - + +/* Scales the world down by this factor, increasing how far you can render on + * console in exchange for a slight loss in precision. -+ * ++ * + * For double extended boundary hacks, a value of 1.5f or 2.0f is good. + * For quadruple extended bounds, use 3.f or 4.f + */ @@ -63,11 +63,11 @@ index 58238e83f..150cff68b 100644 @@ -249,7 +249,7 @@ static void geo_process_perspective(struct GraphNodePerspective *node) { f32 aspect = (f32) gCurGraphNodeRoot->width / (f32) gCurGraphNodeRoot->height; #endif - + - guPerspective(mtx, &perspNorm, node->fov, aspect, node->near, node->far, 1.0f); + guPerspective(mtx, &perspNorm, node->fov, aspect, node->near / WORLD_SCALE, node->far / WORLD_SCALE, 1.0f); gSPPerspNormalize(gDisplayListHead++, perspNorm); - + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(mtx), G_MTX_PROJECTION | G_MTX_LOAD | G_MTX_NOPUSH); @@ -267,17 +267,8 @@ static void geo_process_perspective(struct GraphNodePerspective *node) { * range of this node. @@ -92,7 +92,7 @@ index 58238e83f..150cff68b 100644 @@ -304,6 +295,17 @@ static void geo_process_switch(struct GraphNodeSwitchCase *node) { } } - + +static void make_roll_matrix(Mtx *mtx, s16 angle) { + Mat4 temp; + @@ -113,6 +113,6 @@ index 58238e83f..150cff68b 100644 } - mtxf_rotate_xy(rollMtx, node->rollScreen); + make_roll_matrix(rollMtx, node->rollScreen); - + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(rollMtx), G_MTX_PROJECTION | G_MTX_MUL | G_MTX_NOPUSH); - + diff --git a/enhancements/mem_error_screen.patch b/enhancements/mem_error_screen.patch index 5752b8c1..7530c2fc 100644 --- a/enhancements/mem_error_screen.patch +++ b/enhancements/mem_error_screen.patch @@ -7,17 +7,17 @@ index f50b7622..124c7ec6 100644 $(BUILD_DIR)/src/menu/star_select.o: $(BUILD_DIR)/include/text_strings.h $(BUILD_DIR)/src/game/ingame_menu.o: $(BUILD_DIR)/include/text_strings.h +$(BUILD_DIR)/src/boot/mem_error_screen.o: $(BUILD_DIR)/include/text_strings.h - - + + #==============================================================================# diff --git a/include/segments.h b/include/segments.h index a97d6ee8..186c968e 100644 --- a/include/segments.h +++ b/include/segments.h @@ -3,6 +3,9 @@ - + #include "config.h" - + +/* Use expansion pack RAM */ +#define USE_EXT_RAM 1 + @@ -31,14 +31,14 @@ index 749179b1..2f6f7a3c 100644 @@ -25,6 +25,11 @@ #define TEXT_PAUSE _("PAUSE") // Pause text, Castle Courses #define TEXT_HUD_CONGRATULATIONS _("CONGRATULATIONS") // Course Complete Text, Bowser Courses - + +// Memory Expansion Error Screen +#define TEXT_CONSOLE_8MB _("If you're using an N64 console, then you will need to buy an\nExpansion Pak to play this ROM hack.") +#define TEXT_PJ64 _("If you are using PJ64 1.6, go to:\nOptions > Settings > Rom Settings Tab > Memory Size\nthen select 8 MB from the drop-down box.") +#define TEXT_PJ64_2 _("If you are using PJ64 2.X, go to:\nOptions > Settings > Config: > Memory Size, select 8 MB") + #if defined(VERSION_JP) || defined(VERSION_SH) - + /** diff --git a/levels/entry.c b/levels/entry.c index 17c773ed..677a5ae9 100644 @@ -62,9 +62,9 @@ index 30a87806..6bf7b79a 100644 --- a/levels/intro/geo.c +++ b/levels/intro/geo.c @@ -15,6 +15,24 @@ - + #include "levels/intro/header.h" - + +const GeoLayout intro_geo_error_screen[] = { + GEO_NODE_SCREEN_AREA(0, SCREEN_WIDTH/2, SCREEN_HEIGHT/2, SCREEN_WIDTH/2, SCREEN_HEIGHT/2), + GEO_OPEN_NODE(), @@ -93,7 +93,7 @@ index 99277e86..04797cd7 100644 @@ -26,4 +26,8 @@ extern const LevelScript script_intro_L3[]; extern const LevelScript script_intro_L4[]; extern const LevelScript script_intro_L5[]; - + +extern const GeoLayout intro_geo_error_screen[]; +extern const LevelScript level_intro_entry_error_screen[]; +extern Gfx *geo18_display_error_message(u32 run, UNUSED struct GraphNode *sp44, UNUSED u32 sp48); @@ -106,7 +106,7 @@ index 04b8fc4c..ca9058c4 100644 @@ -18,6 +18,21 @@ #include "make_const_nonconst.h" #include "levels/intro/header.h" - + +const LevelScript level_intro_entry_error_screen[] = { + INIT_LEVEL(), + FIXED_LOAD(/*loadAddr*/ _goddardSegmentStart, /*romStart*/ _goddardSegmentRomStart, /*romEnd*/ _goddardSegmentRomEnd), @@ -131,12 +131,12 @@ index d41a91c8..7d047236 100644 +++ b/src/engine/level_script.h @@ -6,6 +6,7 @@ struct LevelCommand; - + extern u8 level_script_entry[]; +extern u8 level_script_entry_error_screen[]; - + struct LevelCommand *level_script_execute(struct LevelCommand *cmd); - + diff --git a/src/boot/main.c b/src/boot/main.c index 1a9d9e7e..f4f7a9e5 100644 --- a/src/boot/main.c @@ -146,13 +146,13 @@ index 1a9d9e7e..f4f7a9e5 100644 #include "game/main.h" #include "game/rumble_init.h" +#include "mem_error_screen.h" - + // Message IDs #define MESG_SP_COMPLETE 100 @@ -131,6 +132,10 @@ void alloc_pool(void) { void *start = (void *) SEG_POOL_START; void *end = (void *) SEG_POOL_END; - + + // Detect memory size + if (does_pool_end_lie_out_of_bounds(end)) + end = (void *)SEG_POOL_END_4MB; @@ -163,14 +163,14 @@ index 1a9d9e7e..f4f7a9e5 100644 @@ -336,7 +341,10 @@ void thread3_main(UNUSED void *arg) { create_thread(&gSoundThread, 4, thread4_sound, NULL, gThread4Stack + 0x2000, 20); osStartThread(&gSoundThread); - + - create_thread(&gGameLoopThread, 5, thread5_game_loop, NULL, gThread5Stack + 0x2000, 10); + if (!gNotEnoughMemory) + create_thread(&gGameLoopThread, 5, thread5_game_loop, NULL, gThread5Stack + 0x2000, 10); + else + create_thread(&gGameLoopThread, 5, thread5_mem_error_message_loop, NULL, gThread5Stack + 0x2000, 10); osStartThread(&gGameLoopThread); - + while (TRUE) { diff --git a/src/boot/mem_error_screen.c b/src/boot/mem_error_screen.c new file mode 100644 diff --git a/enhancements/platform_displacement_2.diff b/enhancements/platform_displacement_2.diff index ea57e5ef..83599320 100644 --- a/enhancements/platform_displacement_2.diff +++ b/enhancements/platform_displacement_2.diff @@ -11,7 +11,7 @@ index 0000000..6bf33a8 +@@ -972,6 +972,8 @@ s32 bowser_check_fallen_off_stage(void) // bowser off stage? + return 0; + } -+ ++ ++struct PlatformDisplacementInfo sBowserDisplacementInfo; ++ + void (*sBowserActions[])(void) = { bowser_act_default, bowser_act_thrown_dropped, bowser_act_jump_onto_stage, bowser_act_dance, @@ -37,7 +37,7 @@ index 0000000..6bf33a8 +- set_mario_pos(mx, my, mz); ++ //set_mario_pos(mx, my, mz); + } -+ ++ + o->header.gfx.throwMatrix = transform; +diff --git a/src/game/platform_displacement.c b/src/game/platform_displacement.c +index 29a741c..d1bb016 100644 @@ -48,13 +48,13 @@ index 0000000..6bf33a8 + #include "platform_displacement.h" + #include "types.h" ++#include "sm64.h" -+ ++ + u16 D_8032FEC0 = 0; -+ ++ +@@ -84,96 +85,139 @@ void set_mario_pos(f32 x, f32 y, f32 z) { + gMarioStates[0].pos[2] = z; + } -+ ++ +-/** +- * Apply one frame of platform rotation to Mario or an object using the given +- * platform. If isMario is 0, use gCurrentObject. @@ -92,13 +92,13 @@ index 0000000..6bf33a8 +- z += platform->oVelZ; ++static struct PlatformDisplacementInfo sMarioDisplacementInfo; ++static Vec3f sMarioAmountDisplaced; -+ ++ +- if (rotation[0] != 0 || rotation[1] != 0 || rotation[2] != 0) { +- unused1 = rotation[0]; +- unused2 = rotation[2]; +- unused3 = platform->oFaceAngleYaw; ++extern s32 gGlobalTimer; -+ ++ +- if (isMario) { +- gMarioStates[0].faceAngle[1] += rotation[1]; +- } @@ -131,7 +131,7 @@ index 0000000..6bf33a8 ++ dst[2] = src[2] * scale[2]; ++ } ++} -+ ++ +- rotation[0] = platform->oFaceAnglePitch; +- rotation[1] = platform->oFaceAngleYaw; +- rotation[2] = platform->oFaceAngleRoll; @@ -202,19 +202,19 @@ index 0000000..6bf33a8 ++ displaceInfo->prevPlatform = platform; ++ displaceInfo->prevTimer = gGlobalTimer; ++} -+ ++ +- mtxf_rotate_zxy_and_translate(displaceMatrix, currentObjectOffset, rotation); +- linear_mtxf_mul_vec3f(displaceMatrix, newObjectOffset, relativeOffset); ++// Doesn't change in the code, set this to FALSE if you don't want inertia ++u8 gDoInertia = TRUE; -+ ++ +- x = platformPosX + newObjectOffset[0]; +- y = platformPosY + newObjectOffset[1]; +- z = platformPosZ + newObjectOffset[2]; +- } ++static u8 sShouldApplyInertia = FALSE; ++static u8 sInertiaFirstFrame = FALSE; -+ ++ +- if (isMario) { +- set_mario_pos(x, y, z); +- } else { @@ -244,14 +244,14 @@ index 0000000..6bf33a8 ++ sShouldApplyInertia = FALSE; ++ } + } -+ ++ + /** +- * If Mario's platform is not null, apply platform displacement. ++ * Apply platform displacement or inertia if required. + */ + void apply_mario_platform_displacement(void) { + struct Object *platform; -+ ++ + platform = gMarioPlatform; +- if (!(gTimeStopState & TIME_STOP_ACTIVE) && gMarioObject != NULL && platform != NULL) { +- apply_platform_displacement(1, platform); @@ -266,15 +266,15 @@ index 0000000..6bf33a8 ++ } + } + } -+ ++ +diff --git a/src/game/platform_displacement.h b/src/game/platform_displacement.h +index 556192b..3609e2d 100644 +--- a/src/game/platform_displacement.h ++++ b/src/game/platform_displacement.h +@@ -5,10 +5,19 @@ -+ ++ + #include "types.h" -+ ++ ++struct PlatformDisplacementInfo { ++ Vec3f prevPos; ++ Vec3f prevTransformedPos; @@ -299,7 +299,7 @@ index 97cba2a..410e612 100644 @@ -972,6 +972,8 @@ s32 bowser_check_fallen_off_stage(void) // bowser off stage? return 0; } - + +struct PlatformDisplacementInfo sBowserDisplacementInfo; + void (*sBowserActions[])(void) = { bowser_act_default, bowser_act_thrown_dropped, bowser_act_jump_onto_stage, bowser_act_dance, @@ -1938,7 +1938,7 @@ index ebce64f..29136e9 100644 - set_mario_pos(mx, my, mz); + //set_mario_pos(mx, my, mz); } - + o->header.gfx.throwMatrix = transform; diff --git a/src/game/platform_displacement.c b/src/game/platform_displacement.c index 9153bc4..1e8cd86 100644 @@ -1949,13 +1949,13 @@ index 9153bc4..1e8cd86 100644 #include "platform_displacement.h" #include "types.h" +#include "sm64.h" - + u16 D_8032FEC0 = 0; - + @@ -84,98 +85,144 @@ void set_mario_pos(f32 x, f32 y, f32 z) { gMarioStates[0].pos[2] = z; } - + -/** - * Apply one frame of platform rotation to Mario or an object using the given - * platform. If isMario is false, use gCurrentObject. @@ -1998,12 +1998,12 @@ index 9153bc4..1e8cd86 100644 - unused3 = platform->oFaceAngleYaw; +static struct PlatformDisplacementInfo sMarioDisplacementInfo; +static Vec3f sMarioAmountDisplaced; - + - if (isMario) { - gMarioStates[0].faceAngle[1] += rotation[1]; - } +extern s32 gGlobalTimer; - + - platformPosX = platform->oPosX; - platformPosY = platform->oPosY; - platformPosZ = platform->oPosZ; @@ -2032,7 +2032,7 @@ index 9153bc4..1e8cd86 100644 + dst[2] = src[2] * scale[2]; + } +} - + - rotation[0] = platform->oFaceAnglePitch; - rotation[1] = platform->oFaceAngleYaw; - rotation[2] = platform->oFaceAngleRoll; @@ -2103,19 +2103,19 @@ index 9153bc4..1e8cd86 100644 + displaceInfo->prevPlatform = platform; + displaceInfo->prevTimer = gGlobalTimer; +} - + - mtxf_rotate_zxy_and_translate(displaceMatrix, currentObjectOffset, rotation); - linear_mtxf_mul_vec3f(displaceMatrix, newObjectOffset, relativeOffset); +// Doesn't change in the code, set this to FALSE if you don't want inertia +u8 gDoInertia = TRUE; - + - x = platformPosX + newObjectOffset[0]; - y = platformPosY + newObjectOffset[1]; - z = platformPosZ + newObjectOffset[2]; - } +static u8 sShouldApplyInertia = FALSE; +static u8 sInertiaFirstFrame = FALSE; - + - if (isMario) { - set_mario_pos(x, y, z); - } else { @@ -2145,7 +2145,7 @@ index 9153bc4..1e8cd86 100644 + sShouldApplyInertia = FALSE; + } } - + /** - * If Mario's platform is not null, apply platform displacement. + * Apply platform displacement or inertia if required. @@ -2169,7 +2169,7 @@ index 9153bc4..1e8cd86 100644 + } } } - + + + #ifndef VERSION_JP @@ -2378,7 +2378,7 @@ index 0000000..ff20eca +@@ -85,96 +86,139 @@ void set_mario_pos(f32 x, f32 y, f32 z) { + gMarioStates[0].pos[2] = z; + } -+ ++ +-/** +- * Apply one frame of platform rotation to Mario or an object using the given +- * platform. If isMario is 0, use gCurrentObject. @@ -2416,13 +2416,13 @@ index 0000000..ff20eca +- z += platform->oVelZ; ++static struct PlatformDisplacementInfo sMarioDisplacementInfo; ++static Vec3f sMarioAmountDisplaced; -+ ++ +- if (rotation[0] != 0 || rotation[1] != 0 || rotation[2] != 0) { +- unused1 = rotation[0]; +- unused2 = rotation[2]; +- unused3 = platform->oFaceAngleYaw; ++extern s32 gGlobalTimer; -+ ++ +- if (isMario) { +- gMarioStates[0].faceAngle[1] += rotation[1]; +- } @@ -2455,7 +2455,7 @@ index 0000000..ff20eca ++ dst[2] = src[2] * scale[2]; ++ } ++} -+ ++ +- rotation[0] = platform->oFaceAnglePitch; +- rotation[1] = platform->oFaceAngleYaw; +- rotation[2] = platform->oFaceAngleRoll; @@ -2526,19 +2526,19 @@ index 0000000..ff20eca ++ displaceInfo->prevPlatform = platform; ++ displaceInfo->prevTimer = gGlobalTimer; ++} -+ ++ +- mtxf_rotate_zxy_and_translate(displaceMatrix, currentObjectOffset, rotation); +- linear_mtxf_mul_vec3f(displaceMatrix, newObjectOffset, relativeOffset); ++// Doesn't change in the code, set this to FALSE if you don't want inertia ++u8 gDoInertia = TRUE; -+ ++ +- x = platformPosX + newObjectOffset[0]; +- y = platformPosY + newObjectOffset[1]; +- z = platformPosZ + newObjectOffset[2]; +- } ++static u8 sShouldApplyInertia = FALSE; ++static u8 sInertiaFirstFrame = FALSE; -+ ++ +- if (isMario) { +- set_mario_pos(x, y, z); +- } else { @@ -2568,14 +2568,14 @@ index 0000000..ff20eca ++ sShouldApplyInertia = FALSE; ++ } + } -+ ++ + /** +- * If Mario's platform is not null, apply platform displacement. ++ * Apply platform displacement or inertia if required. + */ + void apply_mario_platform_displacement(void) { + struct Object *platform; -+ ++ + platform = gMarioPlatform; +- if (!(gTimeStopState & TIME_STOP_ACTIVE) && gMarioObject != NULL && platform != NULL) { +- apply_platform_displacement(1, platform); @@ -2590,15 +2590,15 @@ index 0000000..ff20eca ++ } + } + } -+ ++ diff --git a/src/game/platform_displacement.h b/src/game/platform_displacement.h index 556192b..3609e2d 100644 --- a/src/game/platform_displacement.h +++ b/src/game/platform_displacement.h @@ -5,10 +5,19 @@ - + #include "types.h" - + +struct PlatformDisplacementInfo { + Vec3f prevPos; + Vec3f prevTransformedPos; diff --git a/enhancements/record_demo.patch b/enhancements/record_demo.patch index a02b9f17..59fc3481 100644 --- a/enhancements/record_demo.patch +++ b/enhancements/record_demo.patch @@ -13,7 +13,7 @@ index b961ca52..adfde049 100644 @@ -386,6 +387,45 @@ void display_and_vsync(void) { // Controls // ---------------------------------------------------------------------------------------------------- - + +/* + * This enhancement allows you to record gameplay demos for the mario head screen. + * @@ -59,7 +59,7 @@ index b961ca52..adfde049 100644 @@ -420,6 +460,118 @@ UNUSED static void record_demo(void) { gRecordedDemoInput.timer++; } - + +void record_new_demo_input(void) { + if (gRecordedDemoInput.timer == 1 && gRecordedDemoInputCopy.timer > 0) { + gRecordedInputs[gNumOfRecordedInputs].timer = gRecordedDemoInputCopy.timer; @@ -181,5 +181,5 @@ index b961ca52..adfde049 100644 read_controller_inputs(); + recordingDemo(); addr = level_script_execute(addr); - + display_and_vsync(); diff --git a/enhancements/reonucam3.patch b/enhancements/reonucam3.patch index 2b9c912e..efc6aec6 100644 --- a/enhancements/reonucam3.patch +++ b/enhancements/reonucam3.patch @@ -5,7 +5,7 @@ index 711d4562..f1c83171 100644 @@ -93,6 +93,12 @@ #define TEXT_HUD_WIDE_INFO _("PLEASE CONFIGURE YOUR DISPLAY OR YOUR EMULATOR TO\nSTRETCH THE IMAGE TO 16:9") #endif - + +#define TEXT_CAM_INFO_SLOWEST _("CAM SPEED: SLOWEST") +#define TEXT_CAM_INFO_SLOW _("CAM SPEED: SLOW") +#define TEXT_CAM_INFO_MEDIUM _("CAM SPEED: MEDIUM") @@ -13,7 +13,7 @@ index 711d4562..f1c83171 100644 +#define TEXT_CAM_INFO_FASTEST _("CAM SPEED: FASTEST") + #if defined(VERSION_JP) || defined(VERSION_SH) - + /** diff --git a/src/game/camera.c b/src/game/camera.c index 25b27983..2ff11930 100644 @@ -30,7 +30,7 @@ index 25b27983..2ff11930 100644 @@ -107,6 +108,7 @@ s16 sCreditsPlayer2Yaw; */ u8 sFramesPaused; - + + extern struct CameraFOVStatus sFOVState; extern struct TransitionInfo sModeTransition; @@ -56,7 +56,7 @@ index 25b27983..2ff11930 100644 f32 baseOff = 125.f; f32 camCeilHeight = find_ceil(c->pos[0], gLakituState.goalPos[1] - 50.f, c->pos[2], &surface); + f32 approachRate = 20.0f; - + if (sMarioCamState->action & ACT_FLAG_HANGING) { marioCeilHeight = sMarioGeometry.currCeilHeight; @@ -790,7 +795,8 @@ void set_camera_height(struct Camera *c, f32 goalHeight) { @@ -76,7 +76,7 @@ index 25b27983..2ff11930 100644 - f32 yOff = 125.f; + f32 yOff; f32 baseDist = 1000.f; - + + if (gMarioState->action & ACT_FLAG_SWIMMING) { + yOff = -125.f; + } else { @@ -99,7 +99,7 @@ index 25b27983..2ff11930 100644 @@ -1170,6 +1192,28 @@ void mode_radial_camera(struct Camera *c) { pan_ahead_of_player(c); } - + +// Returns the camera speed based on the user's camera speed setting +f32 set_camera_speed(void) { + switch(gCameraSpeed) { @@ -131,9 +131,9 @@ index 25b27983..2ff11930 100644 s16 oldAreaYaw = sAreaYaw; + // Get the camera speed based on the user's setting + f32 cameraSpeed = set_camera_speed(); - + radial_camera_input(c); - + - if (gPlayer1Controller->buttonPressed & R_CBUTTONS) { - s8DirModeYawOffset += DEGREES(45); - play_sound_cbutton_side(); @@ -193,7 +193,7 @@ index 25b27983..2ff11930 100644 + s8DirModeBaseYaw = (s8DirModeBaseYaw + 0x1000) & 0xE000; // Lock the camera to the nearest 45deg axis } -#endif - + lakitu_zoom(400.f, 0x900); c->nextYaw = update_8_directions_camera(c, c->focus, pos); + set_camera_height(c, pos[1]); @@ -202,7 +202,7 @@ index 25b27983..2ff11930 100644 sAreaYawChange = sAreaYaw - oldAreaYaw; - set_camera_height(c, pos[1]); } - + + /** * Updates the camera in outward radial mode. @@ -212,14 +212,14 @@ index 25b27983..2ff11930 100644 gLakituState.goalPos[2], &ceil); s16 yawDir; - -+ ++ handle_c_button_movement(c); vec3f_get_dist_and_angle(sMarioCamState->pos, c->pos, &dist, &pitch, &yaw); - + @@ -3036,6 +3097,8 @@ void update_lakitu(struct Camera *c) { void update_camera(struct Camera *c) { UNUSED u8 unused[24]; - + + extern s16 s8DirModeBaseYaw; + gCamera = c; @@ -241,7 +241,7 @@ index 25b27983..2ff11930 100644 - play_sound_if_cam_switched_to_lakitu_or_mario(); + //play_sound_if_cam_switched_to_lakitu_or_mario(); } - + // Initialize the camera @@ -3356,7 +3418,6 @@ void init_camera(struct Camera *c) { struct Surface *floor = 0; @@ -253,26 +253,26 @@ index 25b27983..2ff11930 100644 gPrevLevel = gCurrLevelArea / 16; @@ -4901,15 +4962,15 @@ void play_camera_buzz_if_c_sideways(void) { } - + void play_sound_cbutton_up(void) { - play_sound(SOUND_MENU_CAMERA_ZOOM_IN, gGlobalSoundSource); -+ //play_sound(SOUND_MENU_CAMERA_ZOOM_OUT, gGlobalSoundSource); ++ //play_sound(SOUND_MENU_CAMERA_ZOOM_OUT, gGlobalSoundSource); } - + void play_sound_cbutton_down(void) { - play_sound(SOUND_MENU_CAMERA_ZOOM_OUT, gGlobalSoundSource); + //play_sound(SOUND_MENU_CAMERA_ZOOM_OUT, gGlobalSoundSource); } - + void play_sound_cbutton_side(void) { - play_sound(SOUND_MENU_CAMERA_TURN, gGlobalSoundSource); + //play_sound(SOUND_MENU_CAMERA_TURN, gGlobalSoundSource); } - + void play_sound_button_change_blocked(void) { @@ -5013,7 +5074,7 @@ void radial_camera_input(struct Camera *c) { } - + // Zoom in / enter C-Up - if (gPlayer1Controller->buttonPressed & U_CBUTTONS) { + if (((gPlayer1Controller->buttonPressed & U_CBUTTONS) || (gPlayer2Controller->rawStickY > 40)) && (stickReset) && !(gPlayer1Controller->buttonDown & R_TRIG)) { @@ -281,7 +281,7 @@ index 25b27983..2ff11930 100644 play_sound_cbutton_up(); @@ -5023,7 +5084,7 @@ void radial_camera_input(struct Camera *c) { } - + // Zoom out - if (gPlayer1Controller->buttonPressed & D_CBUTTONS) { + if ((gPlayer1Controller->buttonPressed & D_CBUTTONS) || (gPlayer2Controller->rawStickY < -40)) { @@ -291,7 +291,7 @@ index 25b27983..2ff11930 100644 @@ -5035,6 +5096,12 @@ void radial_camera_input(struct Camera *c) { } } - + + if ((gPlayer2Controller->rawStickY > 40) || (gPlayer2Controller->rawStickY < -40)) { + stickReset = 0; + } else { @@ -327,7 +327,7 @@ index 317e33bf..6687016d 100644 s8 gEepromProbe; #endif @@ -739,6 +744,7 @@ void thread5_game_loop(UNUSED void *arg) { - + play_music(SEQ_PLAYER_SFX, SEQUENCE_ARGS(0, SEQ_SOUND_PLAYER), 0); set_sound_mode(save_file_get_sound_mode()); + gCameraSpeed = (save_file_get_camera_speed()); @@ -356,7 +356,7 @@ index 6cbfd8e1..01dd4de8 100644 @@ -59,6 +59,12 @@ void *languageTable[][3] = #endif }; - + +u8 textCamInfoSlowest[] = { TEXT_CAM_INFO_SLOWEST }; +u8 textCamInfoSlow[] = { TEXT_CAM_INFO_SLOW }; +u8 textCamInfoMedium[] = { TEXT_CAM_INFO_MEDIUM }; @@ -365,11 +365,11 @@ index 6cbfd8e1..01dd4de8 100644 + extern u8 gLastCompletedCourseNum; extern u8 gLastCompletedStarNum; - + @@ -1504,6 +1510,45 @@ void reset_red_coins_collected(void) { gRedCoinsCollected = 0; } - + +void render_camera_speed_setting(void) { + gSPDisplayList(gDisplayListHead++, dl_ia_text_begin); + gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, gDialogTextAlpha); @@ -391,7 +391,7 @@ index 6cbfd8e1..01dd4de8 100644 + break; + } + gSPDisplayList(gDisplayListHead++, dl_ia_text_end); -+ ++ + if (gPlayer1Controller->buttonPressed & R_JPAD) { + if (gCameraSpeed < 4) { + gCameraSpeed += 1; @@ -406,7 +406,7 @@ index 6cbfd8e1..01dd4de8 100644 + gCameraSpeed = 4; + } + save_file_set_camera_speed(gCameraSpeed); -+ } ++ } +} + void change_dialog_camera_angle(void) { @@ -445,7 +445,7 @@ index 31e97bce..29b5e9c4 100644 + if ((heightBelowWater > 800.0f) && (camPreset != CAMERA_MODE_BEHIND_MARIO)) { + set_camera_mode(m->area->camera, CAMERA_MODE_BEHIND_MARIO, 1); + } - + - if ((m->action & ACT_GROUP_MASK) == ACT_GROUP_SUBMERGED) { - heightBelowWater = (f32)(m->waterLevel - 80) - m->pos[1]; - camPreset = m->area->camera->mode; @@ -465,7 +465,7 @@ index 31e97bce..29b5e9c4 100644 + if ((heightBelowWater < 400.0f) && (camPreset != CAMERA_MODE_WATER_SURFACE)) { + set_camera_mode(m->area->camera, CAMERA_MODE_WATER_SURFACE, 1); + } - + - // As long as Mario isn't drowning or at the top - // of the water with his head out, spawn bubbles. - if (!(m->action & ACT_FLAG_INTANGIBLE)) { @@ -488,7 +488,7 @@ index 31e97bce..29b5e9c4 100644 + gWaterCamOverride ^= 1; } } - + diff --git a/src/game/mario_actions_airborne.c b/src/game/mario_actions_airborne.c index ce6467ef..c7e998c1 100644 --- a/src/game/mario_actions_airborne.c @@ -496,7 +496,7 @@ index ce6467ef..c7e998c1 100644 @@ -1736,6 +1736,10 @@ s32 act_shot_from_cannon(struct MarioState *m) { s32 act_flying(struct MarioState *m) { s16 startPitch = m->faceAngle[0]; - + + if (gPlayer1Controller->buttonPressed & R_TRIG) { + gFlyingCamOverride ^= 1; + } @@ -507,33 +507,33 @@ index ce6467ef..c7e998c1 100644 @@ -1750,8 +1754,10 @@ s32 act_flying(struct MarioState *m) { return set_mario_action(m, ACT_FREEFALL, 0); } - + - if (m->area->camera->mode != CAMERA_MODE_BEHIND_MARIO) { + if (!gFlyingCamOverride) { set_camera_mode(m->area->camera, CAMERA_MODE_BEHIND_MARIO, 1); + } else { + set_camera_mode(m->area->camera, CAMERA_MODE_8_DIRECTIONS, 1); } - + if (m->actionState == 0) { @@ -1933,7 +1939,7 @@ s32 act_flying_triple_jump(struct MarioState *m) { } - + if (m->vel[1] < 4.0f) { - if (m->area->camera->mode != CAMERA_MODE_BEHIND_MARIO) { + if ((m->area->camera->mode != CAMERA_MODE_BEHIND_MARIO) && (!gFlyingCamOverride)) { set_camera_mode(m->area->camera, CAMERA_MODE_BEHIND_MARIO, 1); } - + @@ -1944,7 +1950,7 @@ s32 act_flying_triple_jump(struct MarioState *m) { set_mario_action(m, ACT_FLYING, 1); } - + - if (m->actionTimer++ == 10 && m->area->camera->mode != CAMERA_MODE_BEHIND_MARIO) { + if (m->actionTimer++ == 10 && m->area->camera->mode != CAMERA_MODE_BEHIND_MARIO && (!gFlyingCamOverride)) { set_camera_mode(m->area->camera, CAMERA_MODE_BEHIND_MARIO, 1); } - + diff --git a/src/game/save_file.c b/src/game/save_file.c index bcdcdbaf..3f0b8ca1 100644 --- a/src/game/save_file.c @@ -541,7 +541,7 @@ index bcdcdbaf..3f0b8ca1 100644 @@ -673,6 +673,12 @@ u8 save_file_get_widescreen_mode(void) { return gSaveBuffer.menuData[0].wideMode; } - + +void save_file_set_camera_speed(u8 speed) { + gSaveBuffer.menuData[0].cameraSpeedSetting = speed; + gMainMenuDataModified = TRUE; @@ -550,11 +550,11 @@ index bcdcdbaf..3f0b8ca1 100644 + void save_file_set_widescreen_mode(u8 mode) { gSaveBuffer.menuData[0].wideMode = mode; - + @@ -685,6 +691,10 @@ u16 save_file_get_sound_mode(void) { return gSaveBuffer.menuData[0].soundMode; } - + +u8 save_file_get_camera_speed(void) { + return gSaveBuffer.menuData[0].cameraSpeedSetting; +} @@ -571,7 +571,7 @@ index 64cf0c63..085ec1d9 100644 u8 wideMode: 1; #endif + u8 cameraSpeedSetting: 3; - + #ifdef VERSION_EU u8 language: 2; @@ -178,6 +179,8 @@ u16 save_file_get_sound_mode(void); @@ -581,5 +581,5 @@ index 64cf0c63..085ec1d9 100644 +u8 save_file_get_camera_speed(void); +void save_file_set_camera_speed(u8 speed); void save_file_move_cap_to_default_location(void); - + void disable_warp_checkpoint(void); diff --git a/enhancements/wide.diff b/enhancements/wide.diff index 2fba1ec2..a6ea1124 100644 --- a/enhancements/wide.diff +++ b/enhancements/wide.diff @@ -17,9 +17,9 @@ index 0000000..d7f27ad ++#define TEXT_HUD_CURRENT_RATIO_169 _("CURRENT ASPECT RATIO: 16:9. PRESS L TO SWITCH TO 4:3") ++#define TEXT_HUD_WIDE_INFO _("PLEASE CONFIGURE YOUR DISPLAY OR YOUR EMULATOR TO") ++#define TEXT_HUD_WIDE_INFO2 _("STRETCH THE IMAGE TO 16:9") -+ ++ + #if defined(VERSION_JP) || defined(VERSION_SH) -+ ++ +diff --git a/src/game/ingame_menu.c b/src/game/ingame_menu.c +index 8190f88..deb69f5 100644 +--- a/src/game/ingame_menu.c @@ -33,7 +33,7 @@ index 0000000..d7f27ad ++u8 textWideInfo[] = { TEXT_HUD_WIDE_INFO }; ++u8 textWideInfo2[] = { TEXT_HUD_WIDE_INFO2 }; ++extern u8 widescreen = 0; -+ ++ + extern u8 gLastCompletedCourseNum; + extern u8 gLastCompletedStarNum; +@@ -2266,6 +2271,14 @@ void render_pause_my_score_coins(void) { @@ -49,7 +49,7 @@ index 0000000..d7f27ad ++ print_generic_string(10, 180, textWideInfo2); ++ } + #endif -+ ++ + actName = segmented_to_virtual(actNameTbl[(gCurrCourseNum - 1) * 6 + gDialogCourseActNum - 1]); +@@ -2557,10 +2570,25 @@ void render_pause_castle_main_strings(s16 x, s16 y) { + } @@ -63,7 +63,7 @@ index 0000000..d7f27ad ++ widescreen = 0; ++ } ++ } -+ ++ + gSPDisplayList(gDisplayListHead++, dl_ia_text_begin); + gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, gDialogTextAlpha); +- @@ -90,7 +90,7 @@ index 0000000..d7f27ad ++ widescreen = 0; ++ } ++ } -+ ++ + if (gMarioStates[0].action & ACT_FLAG_PAUSE_EXIT) { + render_pause_course_options(99, 93, &gDialogLineNum, 15); +diff --git a/src/game/rendering_graph_node.c b/src/game/rendering_graph_node.c @@ -102,7 +102,7 @@ index 0000000..d7f27ad + #include "shadow.h" + #include "sm64.h" ++#define WIDESCREEN -+ ++ + /** + * This file contains the code that processes the scene graph for rendering. +@@ -235,6 +236,7 @@ static void geo_process_ortho_projection(struct GraphNodeOrthoProjection *node) @@ -126,7 +126,7 @@ index 0000000..d7f27ad ++ aspect = 1.33333f; ++ } + #endif -+ ++ + guPerspective(mtx, &perspNorm, node->fov, aspect, node->near, node->far, 1.0f); +diff --git a/src/menu/file_select.c b/src/menu/file_select.c +index c894797..dc759f7 100644 @@ -150,7 +150,7 @@ index 0000000..d7f27ad +--- a/src/menu/star_select.c ++++ b/src/menu/star_select.c +@@ -52,7 +52,7 @@ static s8 sSelectableStarIndex = 0; -+ ++ + // Act Selector menu timer that keeps counting until you choose an act. + static s32 sActSelectorMenuTimer = 0; +- @@ -178,7 +178,7 @@ index 0000000..d7f27ad + } +@@ -147,11 +154,21 @@ void bhv_act_selector_init(void) { + } -+ ++ + // Render star selector objects +- for (i = 0; i < sVisibleStars; i++) { +- sStarSelectorModels[i] = @@ -201,7 +201,7 @@ index 0000000..d7f27ad ++ sStarSelectorModels[i]->oStarSelectorSize = 1.0f; ++ } + } -+ ++ + render_100_coin_star(stars); diff --git a/enhancements/widescreenv2_ultrasm64.patch b/enhancements/widescreenv2_ultrasm64.patch new file mode 100644 @@ -221,9 +221,9 @@ index 0000000..667e6e2 ++#define TEXT_HUD_CURRENT_RATIO_169 _("CURRENT ASPECT RATIO: 16:9. PRESS L TO SWITCH TO 4:3") ++#define TEXT_HUD_WIDE_INFO _("PLEASE CONFIGURE YOUR DISPLAY OR YOUR EMULATOR TO") ++#define TEXT_HUD_WIDE_INFO2 _("STRETCH THE IMAGE TO 16:9") -+ ++ + #if defined(VERSION_JP) || defined(VERSION_SH) -+ ++ +diff --git a/src/game/ingame_menu.c b/src/game/ingame_menu.c +index 9344738..37bc1d1 100644 +--- a/src/game/ingame_menu.c @@ -237,13 +237,13 @@ index 0000000..667e6e2 ++u8 textWideInfo[] = { TEXT_HUD_WIDE_INFO }; ++u8 textWideInfo2[] = { TEXT_HUD_WIDE_INFO2 }; ++extern s32 widescreen = 0; -+ ++ + extern u8 gLastCompletedCourseNum; + extern u8 gLastCompletedStarNum; +@@ -1672,6 +1677,7 @@ s8 gDialogCourseActNum = 1; + #define DIAG_VAL2 240 // JP & US + #endif -+ ++ ++ + void render_dialog_entries(void) { + #ifdef VERSION_EU @@ -256,7 +256,7 @@ index 0000000..667e6e2 ++ //play_dialog_sound(gDialogID); + play_sound(SOUND_MENU_MESSAGE_APPEAR, gGlobalSoundSource); + } -+ ++ +@@ -2199,6 +2205,7 @@ void render_pause_my_score_coins(void) { + #else + u8 textCourse[] = { TEXT_COURSE }; @@ -277,12 +277,12 @@ index 0000000..667e6e2 ++ print_generic_string(10, 200, textWideInfo); ++ print_generic_string(10, 180, textWideInfo2); ++ } -++ +++ + #endif -+ ++ ++ + actName = segmented_to_virtual(actNameTbl[(gCurrCourseNum - 1) * 6 + gDialogCourseActNum - 1]); -+ ++ + if (starFlags & (1 << (gDialogCourseActNum - 1))) { +@@ -2557,10 +2574,25 @@ void render_pause_castle_main_strings(s16 x, s16 y) { + } @@ -299,7 +299,7 @@ index 0000000..667e6e2 ++ } + gSPDisplayList(gDisplayListHead++, dl_ia_text_begin); + gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, gDialogTextAlpha); -+ ++ ++ if (widescreen == 0) { ++ print_generic_string(10, 20, textCurrRatio43); ++ } @@ -336,7 +336,7 @@ index 0000000..667e6e2 + #include "shadow.h" + #include "sm64.h" ++#define WIDESCREEN -+ ++ + /** + * This file contains the code that processes the scene graph for rendering. +@@ -235,6 +236,8 @@ static void geo_process_ortho_projection(struct GraphNodeOrthoProjection *node) @@ -361,7 +361,7 @@ index 0000000..667e6e2 ++ aspect = 1.33333f; ++ } + #endif -+ ++ + guPerspective(mtx, &perspNorm, node->fov, aspect, node->near, node->far, 1.0f); +diff --git a/src/menu/file_select.c b/src/menu/file_select.c +index 9437dcc..6ba1845 100644 @@ -385,11 +385,11 @@ index 0000000..667e6e2 +--- a/src/menu/star_select.c ++++ b/src/menu/star_select.c +@@ -52,6 +52,7 @@ static s8 sSelectableStarIndex = 0; -+ ++ + // Act Selector menu timer that keeps counting until you choose an act. + static s32 sActSelectorMenuTimer = 0; ++extern s32 widescreen; -+ ++ + /** + * Act Selector Star Type Loop Action +@@ -92,8 +93,14 @@ void bhv_act_selector_star_type_loop(void) { @@ -411,7 +411,7 @@ index 0000000..667e6e2 + } +@@ -147,11 +154,21 @@ void bhv_act_selector_init(void) { + } -+ ++ + // Render star selector objects +- for (i = 0; i < sVisibleStars; i++) { +- sStarSelectorModels[i] = @@ -434,7 +434,7 @@ index 0000000..667e6e2 ++ sStarSelectorModels[i]->oStarSelectorSize = 1.0f; ++ } + } -+ ++ + render_100_coin_star(stars); diff --git a/include/config.h b/include/config.h index 211a086..d1eb721 100644 @@ -464,9 +464,9 @@ index 749179b..3b23b41 100644 +#define TEXT_HUD_CURRENT_RATIO_169 _("CURRENT ASPECT RATIO: 16:9. PRESS L TO SWITCH TO 4:3") +#define TEXT_HUD_WIDE_INFO _("PLEASE CONFIGURE YOUR DISPLAY OR YOUR EMULATOR TO") +#define TEXT_HUD_WIDE_INFO2 _("STRETCH THE IMAGE TO 16:9") - + #if defined(VERSION_JP) || defined(VERSION_SH) - + diff --git a/levels/castle_grounds/script.c b/levels/castle_grounds/script.c index 626bece..b8191ea 100644 --- a/levels/castle_grounds/script.c @@ -492,7 +492,7 @@ index 8190f88..e4d0f32 100644 +u8 textWideInfo[] = { TEXT_HUD_WIDE_INFO }; +u8 textWideInfo2[] = { TEXT_HUD_WIDE_INFO2 }; +u8 widescreen = 1; - + extern u8 gLastCompletedCourseNum; extern u8 gLastCompletedStarNum; @@ -2266,6 +2271,24 @@ void render_pause_my_score_coins(void) { @@ -505,7 +505,7 @@ index 8190f88..e4d0f32 100644 + } else { + print_generic_string(10, 20, textCurrRatio43); + } -+ ++ + } + else { + if (COURSE_IS_MAIN_COURSE(gCurrCourseNum)) { @@ -513,12 +513,12 @@ index 8190f88..e4d0f32 100644 + } else { + print_generic_string(10, 20, textCurrRatio169); + } -+ ++ + print_generic_string(10, 200, textWideInfo); + print_generic_string(10, 180, textWideInfo2); + } #endif - + actName = segmented_to_virtual(actNameTbl[(gCurrCourseNum - 1) * 6 + gDialogCourseActNum - 1]); @@ -2557,10 +2580,25 @@ void render_pause_castle_main_strings(s16 x, s16 y) { } @@ -532,7 +532,7 @@ index 8190f88..e4d0f32 100644 + widescreen = 0; + } + } - + gSPDisplayList(gDisplayListHead++, dl_ia_text_begin); gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, gDialogTextAlpha); - @@ -559,7 +559,7 @@ index 8190f88..e4d0f32 100644 + widescreen = 0; + } + } - + if (gMarioStates[0].action & ACT_FLAG_PAUSE_EXIT) { render_pause_course_options(99, 93, &gDialogLineNum, 15); diff --git a/src/game/level_update.c b/src/game/level_update.c @@ -567,14 +567,14 @@ index 4ecb902..b2d6e53 100644 --- a/src/game/level_update.c +++ b/src/game/level_update.c @@ -1247,6 +1247,10 @@ s32 lvl_init_or_update(s16 initOrUpdate, UNUSED s32 unused) { - + return result; } +extern u8 widescreen; +void lvl_set_widescreen(void) { + widescreen = 1; +} - + s32 lvl_init_from_save_file(UNUSED s16 arg0, s32 levelNum) { #ifdef VERSION_EU diff --git a/src/game/level_update.h b/src/game/level_update.h @@ -586,7 +586,7 @@ index 521b4ef..58d4e75 100644 s32 lvl_play_the_end_screen_sound(UNUSED s16 arg0, UNUSED s32 arg1); void basic_update(UNUSED s16 *arg); +void lvl_set_widescreen(void); - + #endif // LEVEL_UPDATE_H diff --git a/src/game/rendering_graph_node.c b/src/game/rendering_graph_node.c index 58238e8..09a6c87 100644 @@ -597,7 +597,7 @@ index 58238e8..09a6c87 100644 #include "shadow.h" #include "sm64.h" +#define WIDESCREEN - + /** * This file contains the code that processes the scene graph for rendering. @@ -39,6 +40,7 @@ @@ -605,7 +605,7 @@ index 58238e8..09a6c87 100644 Mat4 gMatStack[32]; Mtx *gMatStackFixed[32]; +f32 aspect; - + /** * Animation nodes have state in global variables, so this struct captures @@ -235,6 +237,7 @@ static void geo_process_ortho_projection(struct GraphNodeOrthoProjection *node) @@ -628,7 +628,7 @@ index 58238e8..09a6c87 100644 + aspect = 1.33333f; + } #endif - + guPerspective(mtx, &perspNorm, node->fov, aspect, node->near, node->far, 1.0f); @@ -755,7 +763,7 @@ static s32 obj_is_in_view(struct GraphNodeObject *node, Mat4 matrix) { // ! @bug The aspect ratio is not accounted for. When the fov value is 45, @@ -636,7 +636,7 @@ index 58238e8..09a6c87 100644 // visibly pop in or out at the edge of the screen. - halfFov = (gCurGraphNodeCamFrustum->fov / 2.0f + 1.0f) * 32768.0f / 180.0f + 0.5f; + halfFov = ((gCurGraphNodeCamFrustum->fov*aspect) / 2.0f + 1.0f) * 32768.0f / 180.0f + 0.5f; - + hScreenEdge = -matrix[3][2] * sins(halfFov) / coss(halfFov); // -matrix[3][2] is the depth, which gets multiplied by tan(halfFov) to get diff --git a/src/menu/file_select.c b/src/menu/file_select.c @@ -661,7 +661,7 @@ index 025dbf2..4840898 100644 --- a/src/menu/star_select.c +++ b/src/menu/star_select.c @@ -52,7 +52,7 @@ static s8 sSelectableStarIndex = 0; - + // Act Selector menu timer that keeps counting until you choose an act. static s32 sActSelectorMenuTimer = 0; - @@ -689,7 +689,7 @@ index 025dbf2..4840898 100644 } @@ -147,11 +154,21 @@ void bhv_act_selector_init(void) { } - + // Render star selector objects - for (i = 0; i < sVisibleStars; i++) { - sStarSelectorModels[i] = @@ -712,5 +712,5 @@ index 025dbf2..4840898 100644 + sStarSelectorModels[i]->oStarSelectorSize = 1.0f; + } } - + render_100_coin_star(stars); diff --git a/haveyourcake2.patch b/haveyourcake2.patch index c0968135..bf211006 100644 --- a/haveyourcake2.patch +++ b/haveyourcake2.patch @@ -17,9 +17,9 @@ index 0ea6be6..bba0a94 100644 --- a/levels/ending/leveldata.c +++ b/levels/ending/leveldata.c @@ -250,389 +250,63 @@ const Gfx dl_cake_end_screen_eu_070297D8[] = { - + #include "levels/ending/cake.inc.c" - + -// 0x07025800 - 0x07025840 -static const Vtx cake_end_vertex_07025800[] = { - {{{ 0, 220, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, @@ -460,7 +460,7 @@ index 0ea6be6..bba0a94 100644 + CAKE_RECT((row) * NUM_CAKE_TEXTURES_X + 2),\ + CAKE_RECT((row) * NUM_CAKE_TEXTURES_X + 3),\ + CAKE_RECT((row) * NUM_CAKE_TEXTURES_X + 4) - + // 0x07026400 - 0x07027350 const Gfx dl_cake_end_screen[] = { @@ -640,198 +314,27 @@ const Gfx dl_cake_end_screen[] = { @@ -659,7 +659,7 @@ index 0ea6be6..bba0a94 100644 - gsDPLoadTextureBlock(cake_end_texture_47, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(cake_end_vertex_070263C0, 4, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), -+ ++ + gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, + G_TX_LOADTILE, 0, + G_TX_CLAMP, G_TX_NOMASK, G_TX_NOLOD, @@ -680,7 +680,7 @@ index 0ea6be6..bba0a94 100644 + CAKE_ROW(5), + CAKE_ROW(6), + CAKE_ROW(7), - + gsDPPipeSync(), gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), diff --git a/tools/skyconv.c b/tools/skyconv.c @@ -699,23 +699,23 @@ index b515373..1fdf027 100644 [CakeEU] = { {320, 224, 64, 32, 5, 7, false, false}, @@ -62,7 +62,7 @@ typedef struct { - + static const TableDimension TABLE_DIMENSIONS[ImageType_MAX] = { [Skybox] = {8, 10}, - [Cake] = {4, 12}, + [Cake] = {5, 8}, [CakeEU] = {5, 7}, }; - + @@ -104,15 +104,26 @@ static void split_tile(int col, int row, rgba *image, bool expanded) { int tileWidth = props.tileWidth; int tileHeight = props.tileHeight; int imageWidth = props.imageWidth; + int imageHeight = props.imageHeight; int numCols = props.numCols; - + int expandedWidth = IMAGE_PROPERTIES[type][true].tileWidth; - + + rgba black = {0, 0, 0, 0}; + for (int y = 0; y < tileHeight; y++) { @@ -731,13 +731,13 @@ index b515373..1fdf027 100644 + { + tiles[row * numCols + col].px[y * expandedWidth + x] = black; + } -+ ++ } } } @@ -339,11 +350,12 @@ static void write_cake_c() { } - + int numTiles = TABLE_DIMENSIONS[type].cols * TABLE_DIMENSIONS[type].rows; + fprintf(cFile, "ALIGNED8 static const u8 cake_end_texture_%sdata[] = {\n", euSuffx); for (int i = 0; i < numTiles; ++i) { @@ -749,4 +749,4 @@ index b515373..1fdf027 100644 + fputs("};\n\n", cFile); fclose(cFile); } - + diff --git a/include/level_commands.h b/include/level_commands.h index 07328e0e..630e46e6 100644 --- a/include/level_commands.h +++ b/include/level_commands.h @@ -223,9 +223,9 @@ #define CHANGE_AREA_SKYBOX(area, segStart, segEnd) \ CMD_BBH(0x3E, 0x0C, area), \ CMD_PTR(segStart), \ - CMD_PTR(segEnd) - - + CMD_PTR(segEnd) + + #define INIT_LEVEL() \ CMD_BBH(0x1B, 0x04, 0x0000) diff --git a/include/text_menu_strings.h.in b/include/text_menu_strings.h.in index c9f93af3..3ac477eb 100644 --- a/include/text_menu_strings.h.in +++ b/include/text_menu_strings.h.in @@ -2,7 +2,7 @@ #define TEXT_MENU_STRINGS_H // These strings use a different table defined in menu_hud_lut -// Unlike text_strings.h.in, the charmap is different and +// Unlike text_strings.h.in, the charmap is different and // uses char values from charmap_menu.txt /** diff --git a/levels/castle_inside/painting.inc.c b/levels/castle_inside/painting.inc.c index d668820f..096d2ebd 100644 --- a/levels/castle_inside/painting.inc.c +++ b/levels/castle_inside/painting.inc.c @@ -574,7 +574,7 @@ static const Lights1 inside_castle_seg7_lights_07022528 = gdSPDefLights1( // No gdSPDefLights1 macro defined because of odd different light value (0xff and 0xfa) static const Lights1 inside_castle_seg7_lights_07022540 = { {{ {0x40, 0x40, 0x80}, 0, {0x40, 0x40, 0x80}, 0} }, - {{{ {0x64, 0x64, 0xff}, 0, {0x64, 0x64, 0xfa}, 0, {0x28, 0x28, 0x28},0} }} + {{{ {0x64, 0x64, 0xff}, 0, {0x64, 0x64, 0xfa}, 0, {0x28, 0x28, 0x28},0} }} }; // 0x07022558 - 0x07022598 diff --git a/levels/ending/leveldata.c b/levels/ending/leveldata.c index 84b953f4..88eab4ed 100644 --- a/levels/ending/leveldata.c +++ b/levels/ending/leveldata.c @@ -319,7 +319,7 @@ const Gfx dl_cake_end_screen[] = { gsDPSetCombineMode(G_CC_DECALRGB, G_CC_DECALRGB), gsDPSetRenderMode(G_RM_AA_OPA_SURF, G_RM_AA_OPA_SURF2), gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), - + gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, G_TX_LOADTILE, 0, G_TX_CLAMP, G_TX_NOMASK, G_TX_NOLOD, diff --git a/levels/hmc/areas/1/painting.inc.c b/levels/hmc/areas/1/painting.inc.c index 86e688a1..a0c55961 100644 --- a/levels/hmc/areas/1/painting.inc.c +++ b/levels/hmc/areas/1/painting.inc.c @@ -10,7 +10,7 @@ static const Lights1 hmc_seg7_lights_070241B8 = gdSPDefLights1( // No gdSPDefLights1 macro defined because of odd different light value (0xff and 0xfa) static const Lights1 hmc_seg7_lights_070241D0 = { {{ {0x40, 0x40, 0x80}, 0, {0x40, 0x40, 0x80}, 0} }, - {{{ {0x64, 0x64, 0xff}, 0, {0x64, 0x64, 0xfa}, 0, {0x28, 0x28, 0x28},0} }} + {{{ {0x64, 0x64, 0xff}, 0, {0x64, 0x64, 0xfa}, 0, {0x28, 0x28, 0x28},0} }} }; // Appears to lock 4 of the sides when shimmering and in use. Unused. diff --git a/sm64.ld b/sm64.ld index 16b79416..28f16fb0 100755 --- a/sm64.ld +++ b/sm64.ld @@ -174,7 +174,7 @@ SECTIONS */libgcc.a:*.o(.text); */libz.a:*.o(.text); */libhvqm2.a:*.o(.text); - BUILD_DIR/lib/rsp.o(.text); + BUILD_DIR/lib/rsp.o(.text); lib/PR/hvqm/hvqm2sp1.o(.text); _mainSegmentTextEnd = .; @@ -500,7 +500,7 @@ SECTIONS KEEP(BUILD_DIR/sound/sound_data.o(.data)); } END_SEG(assets) -#ifdef HVQM +#ifdef HVQM BEGIN_SEG(capcom, __romPos) SUBALIGN(2) { KEEP(BUILD_DIR/data/capcom.o(.data)); diff --git a/sound/sequences/00_sound_player.s b/sound/sequences/00_sound_player.s index 4bbc9d6e..713af2c3 100644 --- a/sound/sequences/00_sound_player.s +++ b/sound/sequences/00_sound_player.s @@ -89,7 +89,7 @@ chan_dyncall .poll_023589: chan_delay1 chan_ioreadval 0 -chan_bltz .skip_023589 // if we have a signal: +chan_bltz .skip_023589 // if we have a signal: chan_beqz .force_stop_023589 // told to stop chan_jump .start_playing_023589 // told to play something else .skip_023589: @@ -2696,7 +2696,7 @@ layer_jump .layer_C4E chan_setinstr 0 chan_setlayer 0, .layer_FA2_eu chan_end - + .layer_FA2_eu: layer_delay 0x5 layer_end diff --git a/src/audio/synthesis.c b/src/audio/synthesis.c index df15bcd3..2499690b 100644 --- a/src/audio/synthesis.c +++ b/src/audio/synthesis.c @@ -780,13 +780,9 @@ u64 *synthesis_do_one_audio_update(s16 *aiBuf, s32 bufLen, u64 *cmd, s32 updateI } #else u64 *synthesis_do_one_audio_update(s16 *aiBuf, s32 bufLen, u64 *cmd, s32 updateIndex) { - UNUSED s32 pad1[1]; s16 ra; s16 t4; - UNUSED s32 pad[2]; struct ReverbRingBufferItem *v1; - UNUSED s32 pad2[1]; - s16 temp; v1 = &gSynthesisReverb.items[gSynthesisReverb.curFrame][updateIndex]; @@ -800,7 +796,6 @@ u64 *synthesis_do_one_audio_update(s16 *aiBuf, s32 bufLen, u64 *cmd, s32 updateI if (v1->lengthB != 0) { // Ring buffer wrapped aSetLoadBufferPair(cmd++, v1->lengthA, 0); - temp = 0; } // Use the reverb sound as initial sound for this audio update @@ -814,18 +809,12 @@ u64 *synthesis_do_one_audio_update(s16 *aiBuf, s32 bufLen, u64 *cmd, s32 updateI /*out*/ DMEM_ADDR_WET_LEFT_CH); } else { // Same as above but upsample the previously downsampled samples used for reverb first - temp = 0; //! jesus christ t4 = (v1->startPos & 7) * 2; ra = AUDIO_ALIGN(v1->lengthA + t4, 4); aSetLoadBufferPair(cmd++, 0, v1->startPos - t4 / 2); if (v1->lengthB != 0) { // Ring buffer wrapped aSetLoadBufferPair(cmd++, ra, 0); - //! We need an empty statement (even an empty ';') here to make the function match (because IDO). - //! However, copt removes extraneous statements and dead code. So we need to trick copt - //! into thinking 'temp' could be undefined, and luckily the compiler optimizes out the - //! useless assignment. - ra = ra + temp; } aSetBuffer(cmd++, 0, t4 + DMEM_ADDR_WET_LEFT_CH, DMEM_ADDR_LEFT_CH, bufLen << 1); aResample(cmd++, gSynthesisReverb.resampleFlags, (u16) gSynthesisReverb.resampleRate, VIRTUAL_TO_PHYSICAL2(gSynthesisReverb.resampleStateLeft)); diff --git a/src/boot/main.c b/src/boot/main.c index 02c0ecd6..9ad04463 100644 --- a/src/boot/main.c +++ b/src/boot/main.c @@ -496,27 +496,27 @@ void get_audio_frequency(void) void thread1_idle(UNUSED void *arg) { osCreateViManager(OS_PRIORITY_VIMGR); - switch ( osTvType ) { - case OS_TV_NTSC: - // NTSC + switch ( osTvType ) { + case OS_TV_NTSC: + // NTSC //osViSetMode(&osViModeTable[OS_VI_NTSC_LAN1]); VI = osViModeTable[OS_VI_NTSC_LAN1]; gConfig.tvType = MODE_NTSC; - break; - case OS_TV_MPAL: - // MPAL + break; + case OS_TV_MPAL: + // MPAL //osViSetMode(&osViModeTable[OS_VI_MPAL_LAN1]); VI = osViModeTable[OS_VI_NTSC_LAN1]; gConfig.tvType = MODE_MPAL; - break; - case OS_TV_PAL: - // PAL - //osViSetMode(&osViModeTable[OS_VI_PAL_LAN1]); + break; + case OS_TV_PAL: + // PAL + //osViSetMode(&osViModeTable[OS_VI_PAL_LAN1]); VI = osViModeTable[OS_VI_NTSC_LAN1]; gConfig.tvType = MODE_PAL; - break; - } - get_audio_frequency(); + break; + } + get_audio_frequency(); change_vi(&VI, SCREEN_WIDTH, SCREEN_HEIGHT); osViSetMode(&VI); osViBlack(TRUE); diff --git a/src/boot/memory.c b/src/boot/memory.c index 8dc7d7a4..b5703c69 100644 --- a/src/boot/memory.c +++ b/src/boot/memory.c @@ -416,7 +416,7 @@ void *load_segment_decompress(s32 segment, u8 *srcStart, u8 *srcEnd) { dest = main_pool_alloc(*size, MEMORY_POOL_LEFT); #endif if (dest != NULL) { - osSyncPrintf("start decompress\n"); + osSyncPrintf("start decompress\n"); #ifdef GZIP expand_gzip(compressed, dest, compSize, (u32)size); #elif RNC1 @@ -428,7 +428,7 @@ void *load_segment_decompress(s32 segment, u8 *srcStart, u8 *srcEnd) { #elif MIO0 decompress(compressed, dest); #endif - osSyncPrintf("end decompress\n"); + osSyncPrintf("end decompress\n"); set_segment_base_addr(segment, dest); main_pool_free(compressed); } else { diff --git a/src/buffers/adpcmbuf.c b/src/buffers/adpcmbuf.c index fda80c08..f6ffc338 100644 --- a/src/buffers/adpcmbuf.c +++ b/src/buffers/adpcmbuf.c @@ -1,10 +1,10 @@ -/* +/* * N64-HVQM2 library Sample program - * + * * FILE : adpcmbuf.c - * + * * Copyright (C) 1998,1999 NINTENDO Co.,Ltd. - * + * */ /* 1999-02-22 */ @@ -16,7 +16,7 @@ /* * Buffer for audio records (ADPCM data) read from the HVQM2 data. - * (Note) Please locate at a 16byte aligned address with the spec file. + * (Note) Please locate at a 16byte aligned address with the spec file. */ ALIGNED16 u8 adpcmbuf[AUDIO_RECORD_SIZE_MAX]; diff --git a/src/buffers/hvqbuf.c b/src/buffers/hvqbuf.c index 351fb040..01990f05 100644 --- a/src/buffers/hvqbuf.c +++ b/src/buffers/hvqbuf.c @@ -1,10 +1,10 @@ -/* +/* * N64-HVQM2 library Sample program - * + * * FILE : hvqbuf.c - * + * * Copyright (C) 1998,1999 NINTENDO Co.,Ltd. - * + * */ /* 1999-02-22 */ @@ -15,7 +15,7 @@ #include /* - * Buffer for video records (HVQM2 compressed data) read from + * Buffer for video records (HVQM2 compressed data) read from * the HVQM2 data. * (Note) Please locate at a 16byte aligned address with the spec file. */ diff --git a/src/buffers/hvqmwork.c b/src/buffers/hvqmwork.c index c214983c..094d15c8 100644 --- a/src/buffers/hvqmwork.c +++ b/src/buffers/hvqmwork.c @@ -1,10 +1,10 @@ -/* +/* * N64-HVQM2 library Sample program - * + * * FILE : hvqmwork.c - * + * * Copyright (C) 1998,1999 NINTENDO Co.,Ltd. - * + * */ /* 1999-02-12 */ diff --git a/src/engine/behavior_script.c b/src/engine/behavior_script.c index b523e148..62dca63d 100644 --- a/src/engine/behavior_script.c +++ b/src/engine/behavior_script.c @@ -784,8 +784,6 @@ static s32 bhv_cmd_scale(void) { // Command 0x30: Sets various parameters that the object uses for calculating physics. // Usage: SET_OBJ_PHYSICS(wallHitboxRadius, gravity, bounciness, dragStrength, friction, buoyancy, unused1, unused2) static s32 bhv_cmd_set_obj_physics(void) { - UNUSED f32 unused1, unused2; - gCurrentObject->oWallHitboxRadius = BHV_CMD_GET_1ST_S16(1); gCurrentObject->oGravity = BHV_CMD_GET_2ND_S16(1) / 100.0f; gCurrentObject->oBounciness = BHV_CMD_GET_1ST_S16(2) / 100.0f; @@ -793,8 +791,8 @@ static s32 bhv_cmd_set_obj_physics(void) { gCurrentObject->oFriction = BHV_CMD_GET_1ST_S16(3) / 100.0f; gCurrentObject->oBuoyancy = BHV_CMD_GET_2ND_S16(3) / 100.0f; - unused1 = BHV_CMD_GET_1ST_S16(4) / 100.0f; - unused2 = BHV_CMD_GET_2ND_S16(4) / 100.0f; + UNUSED f32 unused1 = BHV_CMD_GET_1ST_S16(4) / 100.0f; + UNUSED f32 unused2 = BHV_CMD_GET_2ND_S16(4) / 100.0f; gCurBhvCommand += 5; return BHV_PROC_CONTINUE; diff --git a/src/engine/surface_load.c b/src/engine/surface_load.c index 1c7eb441..0c38b3c0 100644 --- a/src/engine/surface_load.c +++ b/src/engine/surface_load.c @@ -498,23 +498,9 @@ static void load_environmental_regions(TerrainData **data) { gEnvironmentRegions = *data; numRegions = *(*data)++; - if (numRegions > 20) { - } - for (i = 0; i < numRegions; i++) { - UNUSED TerrainData val, loX, loZ, hiX, hiZ; - TerrainData height; - - val = *(*data)++; - - loX = *(*data)++; - hiX = *(*data)++; - loZ = *(*data)++; - hiZ = *(*data)++; - - height = *(*data)++; - - gEnvironmentLevels[i] = height; + *data += 5; + gEnvironmentLevels[i] = *(*data)++; } } diff --git a/src/engine/surface_load.h b/src/engine/surface_load.h index dea40ce4..0f8fea57 100644 --- a/src/engine/surface_load.h +++ b/src/engine/surface_load.h @@ -27,9 +27,6 @@ enum typedef struct SurfaceNode SpatialPartitionCell[4]; -// Needed for bs bss reordering memes. -extern s32 unused8038BE90; - extern SpatialPartitionCell gStaticSurfacePartition[NUM_CELLS][NUM_CELLS]; extern SpatialPartitionCell gDynamicSurfacePartition[NUM_CELLS][NUM_CELLS]; extern struct SurfaceNode *sSurfaceNodePool; diff --git a/src/game/_Ldtob.c b/src/game/_Ldtob.c index 182a5e7b..e3e39b48 100644 --- a/src/game/_Ldtob.c +++ b/src/game/_Ldtob.c @@ -63,7 +63,6 @@ void _Ldtob(printf_struct *args, u8 type) { u8 drop; s32 n2; /* */ - UNUSED u8 unused[0x4]; ptr = buff; val = args->value.f64; if (args->precision < 0) { diff --git a/src/game/behaviors/activated_bf_plat.inc.c b/src/game/behaviors/activated_bf_plat.inc.c index bb553c51..e58205fd 100644 --- a/src/game/behaviors/activated_bf_plat.inc.c +++ b/src/game/behaviors/activated_bf_plat.inc.c @@ -61,8 +61,6 @@ void bhv_activated_back_and_forth_platform_init(void) { * Activated back-and-forth platform update function. */ void bhv_activated_back_and_forth_platform_update(void) { - UNUSED s32 unused[3]; - // oVelY is used for vertical platforms' movement and also for // horizontal platforms' dipping up/down when Mario gets on/off them if (gMarioObject->platform == o) { diff --git a/src/game/behaviors/bbh_tilting_trap.inc.c b/src/game/behaviors/bbh_tilting_trap.inc.c index d18f33df..95395751 100644 --- a/src/game/behaviors/bbh_tilting_trap.inc.c +++ b/src/game/behaviors/bbh_tilting_trap.inc.c @@ -8,8 +8,6 @@ * Update function for bhvBbhTiltingTrapPlatform. */ void bhv_bbh_tilting_trap_platform_loop(void) { - UNUSED s32 unused; - // US (and probably later) versions use oAction for the // if statement, while immediately setting it over here. // This was done so that Mario leaving or getting on the platform diff --git a/src/game/behaviors/beta_fish_splash_spawner.inc.c b/src/game/behaviors/beta_fish_splash_spawner.inc.c index 6daab4c6..c007d020 100644 --- a/src/game/behaviors/beta_fish_splash_spawner.inc.c +++ b/src/game/behaviors/beta_fish_splash_spawner.inc.c @@ -12,6 +12,5 @@ * Update function for bhvBetaFishSplashSpawner. */ void bhv_beta_fish_splash_spawner_loop(void) { - UNUSED u8 pad[12]; - UNUSED f32 water_level = find_water_level(o->oPosX, o->oPosZ); + // UNUSED f32 water_level = find_water_level(o->oPosX, o->oPosZ); } diff --git a/src/game/behaviors/bird.inc.c b/src/game/behaviors/bird.inc.c index e6d081a4..91670a67 100644 --- a/src/game/behaviors/bird.inc.c +++ b/src/game/behaviors/bird.inc.c @@ -52,7 +52,6 @@ static void bird_act_inactive(void) { * and the parent spawner bird if it's a spawned bird. */ static void bird_act_fly(void) { - UNUSED s32 unused; f32 distance; // Compute forward velocity and vertical velocity from oBirdSpeed and pitch diff --git a/src/game/behaviors/blue_fish.inc.c b/src/game/behaviors/blue_fish.inc.c index dcaa35b3..939d8b3e 100644 --- a/src/game/behaviors/blue_fish.inc.c +++ b/src/game/behaviors/blue_fish.inc.c @@ -12,13 +12,13 @@ void bhv_blue_fish_movement_loop(void) { // Initial dive phase after spawning case BLUE_FISH_ACT_DIVE: cur_obj_init_animation_with_accel_and_sound(0, 1.0f); - + // Assigns random values to variables that help determine natural motion. if (o->oTimer == 0) { o->oBlueFishRandomAngle = random_sign() << 11; o->oBlueFishRandomVel = random_float() * 2; o->oBlueFishRandomTime = (s32)(random_float() * 30) & 0xFE; - + // Adjusts pitch velocity or sets to zero dependant on outcome of randomSwitch. randomSwitch = random_float() * 5; if (randomSwitch < 2.0f) { @@ -27,20 +27,20 @@ void bhv_blue_fish_movement_loop(void) { o->oAngleVelPitch = 0; } } - + // Set forward velocity and progress oAction to BLUE_FISH_ACT_TURN. o->oForwardVel = o->oBlueFishRandomVel + 3.0f; if (o->oTimer >= o->oBlueFishRandomTime + 60) { o->oAction++; } - + // Set pitch velocity if (o->oTimer < (o->oBlueFishRandomTime + 60) / 2) { o->oFaceAnglePitch += o->oAngleVelPitch; } else { o->oFaceAnglePitch -= o->oAngleVelPitch; } - + // Calculate new Y velocity o->oVelY = -sins(o->oFaceAnglePitch) * o->oForwardVel; break; @@ -51,39 +51,39 @@ void bhv_blue_fish_movement_loop(void) { if (o->oTimer == 15) { o->oAction++; } - break; + break; // Animates and adjusts pitch to an upward direction. case BLUE_FISH_ACT_ASCEND: cur_obj_init_animation_with_accel_and_sound(0, 1.0f); - - // Progresses oAction to BLUE_FISH_ACT_TURN_BACK after elapsed time. + + // Progresses oAction to BLUE_FISH_ACT_TURN_BACK after elapsed time. if (o->oTimer >= o->oBlueFishRandomTime + 60) { o->oAction++; } - + // Adjusts pitch angle. Direction relies on time not passed. if (o->oTimer < (o->oBlueFishRandomTime + 60) / 2) { o->oFaceAnglePitch -= o->oAngleVelPitch; } else { o->oFaceAnglePitch += o->oAngleVelPitch; } - break; + break; // Animates and turns fish around case BLUE_FISH_ACT_TURN_BACK: cur_obj_init_animation_with_accel_and_sound(0, 2.0f); o->oMoveAngleYaw = (s32)(o->oBlueFishRandomAngle + o->oMoveAngleYaw); - + // Sets the fish back to the BLUE_FISH_ACT_DIVE phase. if (o->oTimer == 15) { o->oAction = BLUE_FISH_ACT_DIVE; } break; } - + // Calculates Y velocity and calls physics engine. o->oVelY = -sins(o->oFaceAnglePitch) * o->oForwardVel; cur_obj_move_using_fvel_and_gravity(); - + // Deletes object if the parent has oAction set to BLUE_FISH_ACT_DUPLICATE. if (o->parentObj->oAction == BLUE_FISH_ACT_DUPLICATE) { obj_mark_for_deletion(o); @@ -100,25 +100,25 @@ void bhv_tank_fish_group_loop(void) { switch (o->oAction) { case BLUE_FISH_ACT_SPAWN: if (gMarioCurrentRoom == 15 || gMarioCurrentRoom == 7) { - + // spawns fifteen fish and moves them within 200.0f for (i = 0; i < 15; i++) { fish = spawn_object_relative(0, 300, 0, -200, o, MODEL_FISH, bhvBlueFish); obj_translate_xyz_random(fish, 200.0f); } - + // Proceed to BLUE_FISH_ACT_ROOM phase. o->oAction++; } break; - + // Sets next oAction phase if Mario is not in rooms fifteen and seven. case BLUE_FISH_ACT_ROOM: if (gMarioCurrentRoom != 15 && gMarioCurrentRoom != 7) { o->oAction++; } break; - + // Sets oAction to the BLUE_FISH_ACT_SPAWN phase. case BLUE_FISH_ACT_DUPLICATE: o->oAction = BLUE_FISH_ACT_SPAWN; diff --git a/src/game/behaviors/boo_cage.inc.c b/src/game/behaviors/boo_cage.inc.c index 24e4e062..0626ee20 100644 --- a/src/game/behaviors/boo_cage.inc.c +++ b/src/game/behaviors/boo_cage.inc.c @@ -25,8 +25,6 @@ static struct ObjectHitbox sBooCageHitbox = { * Update function for bhvBooCage. */ void bhv_boo_cage_loop(void) { - UNUSED s32 unused; - obj_set_hitbox(o, &sBooCageHitbox); switch (o->oAction) { diff --git a/src/game/behaviors/bowser.inc.c b/src/game/behaviors/bowser.inc.c index 61ef8d51..164e769b 100644 --- a/src/game/behaviors/bowser.inc.c +++ b/src/game/behaviors/bowser.inc.c @@ -428,7 +428,7 @@ void bowser_set_act_big_jump(void) { void bowser_bits_actions(void) { switch (o->oBowserIsReacting) { case FALSE: - // oBowserBitsJustJump never changes value, + // oBowserBitsJustJump never changes value, // so its always FALSE, maybe a debug define if (o->oBowserBitsJustJump == FALSE) { bowser_bits_action_list(); @@ -726,7 +726,6 @@ void bowser_short_second_hop(void) { * Makes Bowser do a big jump */ void bowser_act_big_jump(void) { - UNUSED s32 unused; if (o->oSubAction == 0) { // Set jump animation if (bowser_set_anim_jump()) { @@ -982,7 +981,6 @@ s32 bowser_check_hit_mine(void) { * Bowser's thrown act that gets called after Mario releases him */ void bowser_act_thrown(void) { - UNUSED s32 unused; // Keep Bowser's timer at 0 unless he lands if (o->oTimer < 2) o->oBowserTimer = 0; @@ -1026,7 +1024,6 @@ void bowser_set_goal_invisible(void) { */ void bowser_act_jump_onto_stage(void) { s32 onDynamicFloor; - UNUSED s32 unused; struct Surface *floor = o->oFloor; // Set dynamic floor check (Object platforms) @@ -1286,7 +1283,6 @@ s32 bowser_dead_default_stage_ending(void) { * Returns TRUE once done */ s32 bowser_dead_final_stage_ending(void) { - UNUSED s32 unused; s32 ret = FALSE; s32 dialogID; if (o->oBowserTimer < 2) { @@ -1383,11 +1379,11 @@ struct BowserTiltPlatformInfo { // 0 = Don't move // 1 = Move angle behind Bowser // -1 = Move angle in front of Bowser - s16 flag; + s16 flag; // Sets platform's tilt angle speed (pattern: positive then negative) - s16 angSpeed; + s16 angSpeed; // Sets how much time the platform can tilt, increases each move - s16 time; + s16 time; }; /** @@ -1414,9 +1410,7 @@ struct BowserTiltPlatformInfo sBowsertiltPlatformData[] = { void bowser_act_tilt_lava_platform(void) { // Set platform object struct Object *platform = cur_obj_nearest_object_with_behavior(bhvTiltingBowserLavaPlatform); - UNUSED s16 angle = o->oBowserAngleToCentre + 0x8000; s16 angSpeed; - UNUSED s32 unused; s32 i; s32 isNotTilting; // If there's not platform, return to default action @@ -1875,14 +1869,12 @@ void bowser_open_eye_switch(struct Object *obj, struct GraphNodeSwitchCase *swit * direction otherwise. */ Gfx *geo_switch_bowser_eyes(s32 callContext, struct GraphNode *node, UNUSED Mat4 *mtx) { - UNUSED s16 eyeShut; - UNUSED s32 unused; struct Object *obj = (struct Object *) gCurGraphNodeObject; struct GraphNodeSwitchCase *switchCase = (struct GraphNodeSwitchCase *) node; if (callContext == GEO_CONTEXT_RENDER) { if (gCurGraphNodeHeldObject != NULL) obj = gCurGraphNodeHeldObject->objNode; - switch (eyeShut = obj->oBowserEyesShut) { + switch (obj->oBowserEyesShut) { case FALSE: // eyes open, handle eye looking direction bowser_open_eye_switch(obj, switchCase); break; diff --git a/src/game/behaviors/bowser_falling_platform.inc.c b/src/game/behaviors/bowser_falling_platform.inc.c index 0d1e0e43..f6b66e7c 100644 --- a/src/game/behaviors/bowser_falling_platform.inc.c +++ b/src/game/behaviors/bowser_falling_platform.inc.c @@ -27,7 +27,6 @@ void falling_bowser_plat_act_start(void) { } void falling_bowser_plat_act_check(void) { - UNUSED s32 unused; struct Object *bowser = o->oBitsPlatformBowser; if (bowser->platform == o) { if (bowser->oAction == BOWSER_ACT_BIG_JUMP && bowser->oBowserStatus & BOWSER_STATUS_BIG_JUMP) { diff --git a/src/game/behaviors/bowser_flame.inc.c b/src/game/behaviors/bowser_flame.inc.c index 4501d977..9927390f 100644 --- a/src/game/behaviors/bowser_flame.inc.c +++ b/src/game/behaviors/bowser_flame.inc.c @@ -116,8 +116,6 @@ void bhv_flame_moving_forward_growing_init(void) { } void bhv_flame_moving_forward_growing_loop(void) { - UNUSED s32 unused; - UNUSED struct Object *flame; obj_set_hitbox(o, &sGrowingBowserFlameHitbox); o->oFlameScale = o->oFlameScale + 0.5; cur_obj_scale(o->oFlameScale); @@ -131,7 +129,7 @@ void bhv_flame_moving_forward_growing_loop(void) { } if (o->oPosY < o->oFloorHeight) { o->oPosY = o->oFloorHeight; - flame = spawn_object(o, MODEL_RED_FLAME, bhvFlameBowser); + spawn_object(o, MODEL_RED_FLAME, bhvFlameBowser); obj_mark_for_deletion(o); } } @@ -152,7 +150,6 @@ void bhv_flame_floating_landing_init(void) { f32 sFlameFloatingYLimit[] = { -8.0f, -6.0f, -3.0f }; void bhv_flame_floating_landing_loop(void) { - UNUSED s32 unused; cur_obj_update_floor_and_walls(); cur_obj_move_standard(78); bowser_flame_move(); diff --git a/src/game/behaviors/camera_lakitu.inc.c b/src/game/behaviors/camera_lakitu.inc.c index 0126d063..3d2ed702 100644 --- a/src/game/behaviors/camera_lakitu.inc.c +++ b/src/game/behaviors/camera_lakitu.inc.c @@ -29,9 +29,7 @@ static void camera_lakitu_intro_act_trigger_cutscene(void) { //! These bounds are slightly smaller than the actual bridge bounds, allowing // the RTA speedrunning method of lakitu skip if (gMarioObject->oPosX > -544.0f && gMarioObject->oPosX < 545.0f && gMarioObject->oPosY > 800.0f - && gMarioObject->oPosZ > -2000.0f && gMarioObject->oPosZ < -177.0f - && gMarioObject->oPosZ < -177.0f) // always double check your conditions - { + && gMarioObject->oPosZ > -2000.0f && gMarioObject->oPosZ < -177.0f) { if (set_mario_npc_dialog(MARIO_DIALOG_LOOK_UP) == MARIO_DIALOG_STATUS_START) { o->oAction = CAMERA_LAKITU_INTRO_ACT_SPAWN_CLOUD; } @@ -115,7 +113,7 @@ static void camera_lakitu_intro_act_show_dialog(void) { } } } - } else if (cur_obj_update_dialog_with_cutscene(MARIO_DIALOG_LOOK_UP, + } else if (cur_obj_update_dialog_with_cutscene(MARIO_DIALOG_LOOK_UP, DIALOG_FLAG_TURN_TO_MARIO, CUTSCENE_DIALOG, DIALOG_034)) { o->oCameraLakituFinishedDialog = TRUE; } diff --git a/src/game/behaviors/cannon.inc.c b/src/game/behaviors/cannon.inc.c index 242b964d..277d0682 100644 --- a/src/game/behaviors/cannon.inc.c +++ b/src/game/behaviors/cannon.inc.c @@ -86,7 +86,6 @@ void opened_cannon_act_5(void) { } void opened_cannon_act_1(void) { - UNUSED s32 unused; cur_obj_become_intangible(); cur_obj_disable_rendering(); o->oCannonIsActive = 0; @@ -98,7 +97,6 @@ void opened_cannon_act_2(void) { } void opened_cannon_act_3(void) { - UNUSED s32 unused; if (o->oTimer > 3) o->oAction = 0; } diff --git a/src/game/behaviors/capswitch.inc.c b/src/game/behaviors/capswitch.inc.c index 9f2c0fae..3b400292 100644 --- a/src/game/behaviors/capswitch.inc.c +++ b/src/game/behaviors/capswitch.inc.c @@ -39,9 +39,9 @@ void cap_switch_act_2(void) { } } else { //! Neither of these flags are defined in this function so they do nothing. - // On an extra note, there's a specific check for this cutscene and + // On an extra note, there's a specific check for this cutscene and // there's no dialog defined since the cutscene itself calls the dialog. - response = cur_obj_update_dialog_with_cutscene(MARIO_DIALOG_LOOK_FRONT, + response = cur_obj_update_dialog_with_cutscene(MARIO_DIALOG_LOOK_FRONT, (DIALOG_FLAG_TEXT_RESPONSE | DIALOG_FLAG_UNK_CAPSWITCH), CUTSCENE_CAP_SWITCH_PRESS, 0); if (response) o->oAction = 3; diff --git a/src/game/behaviors/castle_floor_trap.inc.c b/src/game/behaviors/castle_floor_trap.inc.c index 5f19bccc..38e675bd 100644 --- a/src/game/behaviors/castle_floor_trap.inc.c +++ b/src/game/behaviors/castle_floor_trap.inc.c @@ -54,7 +54,6 @@ void bhv_castle_floor_trap_rotate(void) { } void bhv_castle_floor_trap_loop(void) { - UNUSED s32 unused[3]; switch (o->oAction) { case 0: bhv_castle_floor_trap_open_detect(); diff --git a/src/game/behaviors/chain_chomp.inc.c b/src/game/behaviors/chain_chomp.inc.c index 6af473e1..74543a3c 100644 --- a/src/game/behaviors/chain_chomp.inc.c +++ b/src/game/behaviors/chain_chomp.inc.c @@ -256,7 +256,7 @@ static void chain_chomp_released_trigger_cutscene(void) { //! Can delay this if we get into a cutscene-unfriendly action after the // last post ground pound and before this - if (set_mario_npc_dialog(MARIO_DIALOG_LOOK_UP) == MARIO_DIALOG_STATUS_SPEAK + if (set_mario_npc_dialog(MARIO_DIALOG_LOOK_UP) == MARIO_DIALOG_STATUS_SPEAK && (o->oMoveFlags & OBJ_MOVE_MASK_ON_GROUND) && cutscene_object(CUTSCENE_STAR_SPAWN, o) == 1) { o->oChainChompReleaseStatus = CHAIN_CHOMP_RELEASED_LUNGE_AROUND; o->oTimer = 0; diff --git a/src/game/behaviors/chuckya.inc.c b/src/game/behaviors/chuckya.inc.c index 8e70e957..942e4124 100644 --- a/src/game/behaviors/chuckya.inc.c +++ b/src/game/behaviors/chuckya.inc.c @@ -6,12 +6,6 @@ struct UnusedChuckyaData { f32 unk8; }; -struct UnusedChuckyaData sUnusedChuckyaData[] = { { 2, 0.f, 1.f }, - { 2, 10.f, 1.f }, - { 2, 20.f, 1.f }, - { 2, 20.f, 1.f }, - { 8, 10.f, 1.f }}; - void common_anchor_mario_behavior(f32 forwardVel, f32 yVel, s32 flag) { switch (o->parentObj->oCommonAnchorAction) { case 0: diff --git a/src/game/behaviors/collide_particles.inc.c b/src/game/behaviors/collide_particles.inc.c index 67ca9566..9a46ea50 100644 --- a/src/game/behaviors/collide_particles.inc.c +++ b/src/game/behaviors/collide_particles.inc.c @@ -24,7 +24,6 @@ void bhv_punch_tiny_triangle_loop(void) { void bhv_punch_tiny_triangle_init(void) { s32 i; - UNUSED s32 unused; struct Object *triangle; for (i = 0; i < 6; i++) { triangle = spawn_object(o, MODEL_DIRT_ANIMATION, bhvPunchTinyTriangle); @@ -50,7 +49,6 @@ void bhv_wall_tiny_star_particle_loop(void) { void bhv_tiny_star_particles_init(void) { s32 i; - UNUSED s32 unused; struct Object *particle; for (i = 0; i < 7; i++) { particle = spawn_object(o, MODEL_CARTOON_STAR, bhvWallTinyStarParticle); diff --git a/src/game/behaviors/door.inc.c b/src/game/behaviors/door.inc.c index 0a68204f..8685fdcb 100644 --- a/src/game/behaviors/door.inc.c +++ b/src/game/behaviors/door.inc.c @@ -45,7 +45,7 @@ void play_warp_door_open_noise(void) { void bhv_door_loop(void) { s32 index = 0; - + while (sDoorActions[index].flag != (u32)~0) { if (cur_obj_clear_interact_status_flag(sDoorActions[index].flag)) { set_door_camera_event(); diff --git a/src/game/behaviors/dorrie.inc.c b/src/game/behaviors/dorrie.inc.c index d6d3c8c2..c4ff79be 100644 --- a/src/game/behaviors/dorrie.inc.c +++ b/src/game/behaviors/dorrie.inc.c @@ -68,7 +68,7 @@ void dorrie_act_lower_head(void) { if (o->oTimer > 150) { dorrie_begin_head_raise(FALSE); } else if (gMarioObject->platform == o) { - if (o->oDorrieForwardDistToMario > 830.0f + if (o->oDorrieForwardDistToMario > 830.0f && set_mario_npc_dialog(MARIO_DIALOG_LOOK_UP) == MARIO_DIALOG_STATUS_START) { dorrie_begin_head_raise(TRUE); } else if (o->oDorrieForwardDistToMario > 320.0f) { @@ -112,8 +112,6 @@ void dorrie_act_raise_head(void) { void bhv_dorrie_update(void) { f32 boundsShift; - UNUSED s32 unused1; - UNUSED s32 unused2; f32 maxOffsetY; if (!(o->activeFlags & ACTIVE_FLAG_IN_DIFFERENT_ROOM)) { diff --git a/src/game/behaviors/elevator.inc.c b/src/game/behaviors/elevator.inc.c index b143bef6..bd75c0d8 100644 --- a/src/game/behaviors/elevator.inc.c +++ b/src/game/behaviors/elevator.inc.c @@ -1,11 +1,11 @@ // elevator.c.inc -static s16 sElevatorHeights[] = { -51, 0, 0, - -461, 0, 0, - -512, 0, 0, - -2611, 0, 0, - -2360, 0, 0, - 214, 0, 0, +static s16 sElevatorHeights[] = { -51, 0, 0, + -461, 0, 0, + -512, 0, 0, + -2611, 0, 0, + -2360, 0, 0, + 214, 0, 0, -50, 1945, 1 }; void elevator_starting_shake(void) { diff --git a/src/game/behaviors/exclamation_box.inc.c b/src/game/behaviors/exclamation_box.inc.c index a05ff040..ab2e4184 100644 --- a/src/game/behaviors/exclamation_box.inc.c +++ b/src/game/behaviors/exclamation_box.inc.c @@ -86,7 +86,6 @@ void exclamation_box_act_2(void) { } void exclamation_box_act_3(void) { - UNUSED s32 unused; cur_obj_move_using_fvel_and_gravity(); if (o->oVelY < 0.0f) { o->oVelY = 0.0f; diff --git a/src/game/behaviors/fish.inc.c b/src/game/behaviors/fish.inc.c index 9590b096..a6ce5499 100644 --- a/src/game/behaviors/fish.inc.c +++ b/src/game/behaviors/fish.inc.c @@ -84,7 +84,7 @@ void bhv_fish_spawner_loop(void) { static void fish_vertical_roam(s32 speed) { f32 parentY = o->parentObj->oPosY; - // If the stage is Secret Aquarium, the fish can + // If the stage is Secret Aquarium, the fish can // travel as far vertically as they wish. if (gCurrLevelNum == LEVEL_SA) { if (500.0f < absf(o->oPosY - o->oFishGoalY)) { @@ -125,7 +125,7 @@ static void fish_act_roam(void) { } o->oFishGoalY = gMarioObject->oPosY + o->oFishHeightOffset; - + // Rotate the fish towards Mario. cur_obj_rotate_yaw_toward(o->oAngleToMario, 0x400); @@ -201,7 +201,7 @@ static void fish_act_flee(void) { } else { fish_vertical_roam(4); } - + // Don't let the fish leave the water vertically. } else { o->oPosY = o->oFishWaterLevel - 50.0f; @@ -234,9 +234,7 @@ static void (*sFishActions[])(void) = { /** * Main loop for fish */ -void bhv_fish_loop(void) -{ - UNUSED s32 unused[4]; +void bhv_fish_loop(void) { cur_obj_scale(1.0f); // oFishWaterLevel tracks if a fish has roamed out of water. diff --git a/src/game/behaviors/flamethrower.inc.c b/src/game/behaviors/flamethrower.inc.c index 4d1bb909..adcb23b8 100644 --- a/src/game/behaviors/flamethrower.inc.c +++ b/src/game/behaviors/flamethrower.inc.c @@ -38,7 +38,6 @@ void bhv_flamethrower_loop(void) { f32 flameVel; s32 flameTimeRemaining; s32 model; - UNUSED u8 pad[8]; if (o->oAction == 0) { if (gCurrLevelNum != LEVEL_BBH || gMarioOnMerryGoRound == TRUE) if (o->oDistanceToMario < 2000.0f) diff --git a/src/game/behaviors/goomba.inc.c b/src/game/behaviors/goomba.inc.c index 2dab2fec..c1155eca 100644 --- a/src/game/behaviors/goomba.inc.c +++ b/src/game/behaviors/goomba.inc.c @@ -67,9 +67,7 @@ static u8 sGoombaAttackHandlers[][6] = { * Update function for goomba triplet spawner. */ void bhv_goomba_triplet_spawner_update(void) { - UNUSED s32 unused1; s16 goombaFlag; - UNUSED s16 unused2; s32 angle; s32 dAngle; s16 dx; diff --git a/src/game/behaviors/heave_ho.inc.c b/src/game/behaviors/heave_ho.inc.c index a69c68f7..a7eb869a 100644 --- a/src/game/behaviors/heave_ho.inc.c +++ b/src/game/behaviors/heave_ho.inc.c @@ -41,7 +41,6 @@ void heave_ho_act_1(void) { } void heave_ho_act_2(void) { - UNUSED s32 unused; s16 angleVel; if (1000.0f < cur_obj_lateral_dist_from_mario_to_home()) o->oAngleToMario = cur_obj_angle_to_home(); diff --git a/src/game/behaviors/hoot.inc.c b/src/game/behaviors/hoot.inc.c index 8f857eae..83dd55cb 100644 --- a/src/game/behaviors/hoot.inc.c +++ b/src/game/behaviors/hoot.inc.c @@ -232,7 +232,7 @@ void bhv_hoot_loop(void) { case HOOT_AVAIL_WANTS_TO_TALK: hoot_awake_loop(); - if (set_mario_npc_dialog(MARIO_DIALOG_LOOK_UP) == MARIO_DIALOG_STATUS_SPEAK + if (set_mario_npc_dialog(MARIO_DIALOG_LOOK_UP) == MARIO_DIALOG_STATUS_SPEAK && cutscene_object_with_dialog(CUTSCENE_DIALOG, o, DIALOG_044)) { set_mario_npc_dialog(MARIO_DIALOG_STOP); diff --git a/src/game/behaviors/intro_lakitu.inc.c b/src/game/behaviors/intro_lakitu.inc.c index 275baffd..6fdf20b7 100644 --- a/src/game/behaviors/intro_lakitu.inc.c +++ b/src/game/behaviors/intro_lakitu.inc.c @@ -24,11 +24,9 @@ void intro_lakitu_set_offset_from_camera(struct Object *o, Vec3f offset) { } void intro_lakitu_set_focus(struct Object *o, Vec3f newFocus) { - UNUSED Vec3f unusedVec3f; Vec3f origin; f32 dist; s16 pitch, yaw; - UNUSED u32 unused; // newFocus is an offset from lakitu's origin, not a point in the world. vec3f_set(origin, 0.f, 0.f, 0.f); @@ -59,7 +57,6 @@ s32 intro_lakitu_set_pos_and_focus(struct Object *o, struct CutsceneSplinePoint void bhv_intro_lakitu_loop(void) { Vec3f offset, fromPoint, toPoint; - UNUSED u32 pad[4]; switch (gCurrentObject->oAction) { case 0: diff --git a/src/game/behaviors/king_bobomb.inc.c b/src/game/behaviors/king_bobomb.inc.c index beb40462..6920522b 100644 --- a/src/game/behaviors/king_bobomb.inc.c +++ b/src/game/behaviors/king_bobomb.inc.c @@ -171,7 +171,7 @@ void king_bobomb_act_6(void) { void king_bobomb_act_7(void) { cur_obj_init_animation_with_sound(2); - if (cur_obj_update_dialog_with_cutscene(MARIO_DIALOG_LOOK_UP, + if (cur_obj_update_dialog_with_cutscene(MARIO_DIALOG_LOOK_UP, DIALOG_FLAG_TEXT_DEFAULT, CUTSCENE_DIALOG, DIALOG_116)) { create_sound_spawner(SOUND_OBJ_KING_WHOMP_DEATH); cur_obj_hide(); @@ -264,7 +264,7 @@ void king_bobomb_act_5(void) { // bobomb returns home o->oSubAction++; break; case 4: - if (cur_obj_update_dialog_with_cutscene(MARIO_DIALOG_LOOK_UP, + if (cur_obj_update_dialog_with_cutscene(MARIO_DIALOG_LOOK_UP, DIALOG_FLAG_TURN_TO_MARIO, CUTSCENE_DIALOG, DIALOG_128)) o->oAction = 2; break; diff --git a/src/game/behaviors/klepto.inc.c b/src/game/behaviors/klepto.inc.c index e0ff9830..97e816ba 100644 --- a/src/game/behaviors/klepto.inc.c +++ b/src/game/behaviors/klepto.inc.c @@ -319,8 +319,6 @@ void obj_set_speed_to_zero(void) { } void bhv_klepto_update(void) { - UNUSED s32 unused; - cur_obj_update_floor_and_walls(); o->oKleptoDistanceToTarget = cur_obj_lateral_dist_to_home(); diff --git a/src/game/behaviors/koopa.inc.c b/src/game/behaviors/koopa.inc.c index 8e3e8779..9440dfda 100644 --- a/src/game/behaviors/koopa.inc.c +++ b/src/game/behaviors/koopa.inc.c @@ -519,8 +519,6 @@ static void koopa_the_quick_act_show_init_text(void) { sKoopaTheQuickProperties[o->oKoopaTheQuickRaceIndex].initText); if (response == DIALOG_RESPONSE_YES) { - UNUSED s32 unused; - gMarioShotFromCannon = FALSE; o->oAction = KOOPA_THE_QUICK_ACT_RACE; o->oForwardVel = 0.0f; @@ -731,7 +729,7 @@ static void koopa_the_quick_act_after_race(void) { o->oFlags &= ~OBJ_FLAG_ACTIVE_FROM_AFAR; } } else if (o->parentObj->oKoopaRaceEndpointDialog > 0) { - s32 dialogResponse = cur_obj_update_dialog_with_cutscene(MARIO_DIALOG_LOOK_UP, + s32 dialogResponse = cur_obj_update_dialog_with_cutscene(MARIO_DIALOG_LOOK_UP, DIALOG_FLAG_TURN_TO_MARIO, CUTSCENE_DIALOG, o->parentObj->oKoopaRaceEndpointDialog); if (dialogResponse != 0) { o->parentObj->oKoopaRaceEndpointDialog = DIALOG_NONE; diff --git a/src/game/behaviors/koopa_shell.inc.c b/src/game/behaviors/koopa_shell.inc.c index 4a790de9..446cff4e 100644 --- a/src/game/behaviors/koopa_shell.inc.c +++ b/src/game/behaviors/koopa_shell.inc.c @@ -13,7 +13,6 @@ struct ObjectHitbox sKoopaShellHitbox = { }; void koopa_shell_spawn_water_drop(void) { - UNUSED s32 unused; struct Object *drop; spawn_object(o, MODEL_WAVE_TRAIL, bhvObjectWaveTrail); if (gMarioStates[0].forwardVel > 10.0f) { diff --git a/src/game/behaviors/lll_hexagonal_ring.inc.c b/src/game/behaviors/lll_hexagonal_ring.inc.c index 25d94c38..014da42b 100644 --- a/src/game/behaviors/lll_hexagonal_ring.inc.c +++ b/src/game/behaviors/lll_hexagonal_ring.inc.c @@ -15,7 +15,6 @@ void hexagonal_ring_spawn_flames(void) { } void bhv_lll_rotating_hexagonal_ring_loop(void) { - UNUSED s32 unused; o->oCollisionDistance = 4000.0f; o->oDrawingDistance = 8000.0f; switch (o->oAction) { diff --git a/src/game/behaviors/lll_volcano_flames.inc.c b/src/game/behaviors/lll_volcano_flames.inc.c index aa2fbc6f..f0cc4788 100644 --- a/src/game/behaviors/lll_volcano_flames.inc.c +++ b/src/game/behaviors/lll_volcano_flames.inc.c @@ -7,7 +7,7 @@ void bhv_volcano_flames_loop(void) { o->oPosZ += o->oVelZ; cur_obj_move_y(-4.0f, -0.7f, 2.0f); - if (o->oMoveFlags & (OBJ_MOVE_MASK_ON_GROUND | OBJ_MOVE_AT_WATER_SURFACE + if (o->oMoveFlags & (OBJ_MOVE_MASK_ON_GROUND | OBJ_MOVE_AT_WATER_SURFACE | OBJ_MOVE_UNDERWATER_OFF_GROUND)) obj_mark_for_deletion(o); } diff --git a/src/game/behaviors/manta_ray.inc.c b/src/game/behaviors/manta_ray.inc.c index e7ee0d12..d8d1a677 100644 --- a/src/game/behaviors/manta_ray.inc.c +++ b/src/game/behaviors/manta_ray.inc.c @@ -5,15 +5,15 @@ * These rings contain a significant bug that is documented in water_ring.inc.c */ -static Trajectory sMantaRayTraj[] = { - TRAJECTORY_POS(0, /*pos*/ -4500, -1380, -40), - TRAJECTORY_POS(1, /*pos*/ -4120, -2240, 740), - TRAJECTORY_POS(2, /*pos*/ -3280, -3080, 1040), - TRAJECTORY_POS(3, /*pos*/ -2240, -3320, 720), - TRAJECTORY_POS(4, /*pos*/ -1840, -3140, -280), - TRAJECTORY_POS(5, /*pos*/ -2320, -2480, -1100), - TRAJECTORY_POS(6, /*pos*/ -3220, -1600, -1360), - TRAJECTORY_POS(7, /*pos*/ -4180, -1020, -1040), +static Trajectory sMantaRayTraj[] = { + TRAJECTORY_POS(0, /*pos*/ -4500, -1380, -40), + TRAJECTORY_POS(1, /*pos*/ -4120, -2240, 740), + TRAJECTORY_POS(2, /*pos*/ -3280, -3080, 1040), + TRAJECTORY_POS(3, /*pos*/ -2240, -3320, 720), + TRAJECTORY_POS(4, /*pos*/ -1840, -3140, -280), + TRAJECTORY_POS(5, /*pos*/ -2320, -2480, -1100), + TRAJECTORY_POS(6, /*pos*/ -3220, -1600, -1360), + TRAJECTORY_POS(7, /*pos*/ -4180, -1020, -1040), TRAJECTORY_END(), }; diff --git a/src/game/behaviors/metal_box.inc.c b/src/game/behaviors/metal_box.inc.c index fc9731a1..5ff822bc 100644 --- a/src/game/behaviors/metal_box.inc.c +++ b/src/game/behaviors/metal_box.inc.c @@ -24,7 +24,6 @@ s32 check_if_moving_over_floor(f32 maxDist, f32 offset) { } void bhv_pushable_loop(void) { - UNUSED s16 unused; s16 angleToMario; obj_set_hitbox(o, &sMetalBoxHitbox); o->oForwardVel = 0.0f; diff --git a/src/game/behaviors/piranha_bubbles.inc.c b/src/game/behaviors/piranha_bubbles.inc.c index 447c2751..a6d54d44 100644 --- a/src/game/behaviors/piranha_bubbles.inc.c +++ b/src/game/behaviors/piranha_bubbles.inc.c @@ -33,7 +33,6 @@ void bhv_piranha_plant_bubble_loop(void) { s32 frame = parent->header.gfx.animInfo.animFrame; // TODO: rename lastFrame if it is inaccurate s32 lastFrame = parent->header.gfx.animInfo.curAnim->loopEnd - 2; - s32 UNUSED unused; f32 doneShrinkingFrame; // the first frame after shrinking is done f32 beginGrowingFrame; // the frame just before growing begins diff --git a/src/game/behaviors/purple_switch.inc.c b/src/game/behaviors/purple_switch.inc.c index 0a548b87..e6606b4a 100644 --- a/src/game/behaviors/purple_switch.inc.c +++ b/src/game/behaviors/purple_switch.inc.c @@ -7,7 +7,6 @@ */ void bhv_purple_switch_loop(void) { - UNUSED s32 unused; switch (o->oAction) { /** * Set the switch's model and scale. If Mario is standing near the diff --git a/src/game/behaviors/racing_penguin.inc.c b/src/game/behaviors/racing_penguin.inc.c index a287229d..74a86cc7 100644 --- a/src/game/behaviors/racing_penguin.inc.c +++ b/src/game/behaviors/racing_penguin.inc.c @@ -143,7 +143,7 @@ static void racing_penguin_act_show_final_text(void) { o->oForwardVel = 4.0f; } } else if (o->oRacingPenguinFinalTextbox > 0) { - if ((textResult = cur_obj_update_dialog_with_cutscene(MARIO_DIALOG_LOOK_UP, + if ((textResult = cur_obj_update_dialog_with_cutscene(MARIO_DIALOG_LOOK_UP, DIALOG_FLAG_TURN_TO_MARIO, CUTSCENE_DIALOG, o->oRacingPenguinFinalTextbox))) { o->oRacingPenguinFinalTextbox = -1; o->oTimer = 0; diff --git a/src/game/behaviors/scuttlebug.inc.c b/src/game/behaviors/scuttlebug.inc.c index c7631cd6..fffe6b59 100644 --- a/src/game/behaviors/scuttlebug.inc.c +++ b/src/game/behaviors/scuttlebug.inc.c @@ -24,7 +24,6 @@ s32 update_angle_from_move_flags(s32 *angle) { } void bhv_scuttlebug_loop(void) { - UNUSED s32 unused; f32 animSpeed; cur_obj_update_floor_and_walls(); if (o->oSubAction != 0 diff --git a/src/game/behaviors/seesaw_platform.inc.c b/src/game/behaviors/seesaw_platform.inc.c index 81a47e76..8c9e3b65 100644 --- a/src/game/behaviors/seesaw_platform.inc.c +++ b/src/game/behaviors/seesaw_platform.inc.c @@ -39,7 +39,6 @@ void bhv_seesaw_platform_update(void) { if (gMarioObject->platform == o) { // Rotate toward mario f32 rotation = o->oDistanceToMario * coss(o->oAngleToMario - o->oMoveAngleYaw); - UNUSED s32 unused; // Deceleration is faster than acceleration if (o->oSeesawPlatformPitchVel * rotation < 0) { diff --git a/src/game/behaviors/sl_snowman_wind.inc.c b/src/game/behaviors/sl_snowman_wind.inc.c index 508615ab..7d118b55 100644 --- a/src/game/behaviors/sl_snowman_wind.inc.c +++ b/src/game/behaviors/sl_snowman_wind.inc.c @@ -1,29 +1,28 @@ // sl_snowman_wind.c.inc void bhv_sl_snowman_wind_loop(void) { - UNUSED s32 unusedVar = 0; s16 marioAngleFromWindSource; Vec3f tempPos; - + if (o->oTimer == 0) o->oSLSnowmanWindOriginalYaw = o->oMoveAngleYaw; - + // Waiting for Mario to approach. if (o->oSubAction == SL_SNOWMAN_WIND_ACT_IDLE) { o->oDistanceToMario = 0; - + // Check if Mario is within 1000 units of the center of the bridge, and ready to speak. vec3f_copy_2(tempPos, &o->oPosX); obj_set_pos(o, 1100, 3328, 1164); // Position is in the middle of the ice bridge if (cur_obj_can_mario_activate_textbox(1000.0f, 30.0f, 0x7FFF)) o->oSubAction++; vec3f_copy_2(&o->oPosX, tempPos); - + // Mario has come close, begin dialog. } else if (o->oSubAction == SL_SNOWMAN_WIND_ACT_TALKING) { if (cur_obj_update_dialog(MARIO_DIALOG_LOOK_UP, DIALOG_FLAG_TEXT_DEFAULT, DIALOG_153, 0)) o->oSubAction++; - + // Blowing, spawn wind particles (SL_SNOWMAN_WIND_ACT_BLOWING) } else if (o->oDistanceToMario < 1500.0f && absf(gMarioObject->oPosY - o->oHomeY) < 500.0f) { // Point towards Mario, but only within 0x1500 angle units of the original angle. diff --git a/src/game/behaviors/sl_walking_penguin.inc.c b/src/game/behaviors/sl_walking_penguin.inc.c index f5b60a8a..acd2ef16 100644 --- a/src/game/behaviors/sl_walking_penguin.inc.c +++ b/src/game/behaviors/sl_walking_penguin.inc.c @@ -22,11 +22,11 @@ static s32 sl_walking_penguin_turn(void) { // Stay still and use walking animation for the turn. o->oForwardVel = 0.0f; cur_obj_init_animation_with_accel_and_sound(PENGUIN_ANIM_WALK, 1.0f); - + // Turn around. o->oAngleVelYaw = 0x400; o->oMoveAngleYaw += o->oAngleVelYaw; - + if (o->oTimer == 31) return TRUE; // Finished turning else @@ -36,10 +36,10 @@ static s32 sl_walking_penguin_turn(void) { void bhv_sl_walking_penguin_loop(void) { f32 adjustedXPos, adjustedZPos; f32 perpendicularOffset = 100.0f; - + o->oAngleVelYaw = 0; cur_obj_update_floor_and_walls(); - + switch (o->oAction) { // Walk erratically across the ice bridge using preset steps. case SL_WALKING_PENGUIN_ACT_MOVING_FORWARDS: @@ -48,7 +48,7 @@ void bhv_sl_walking_penguin_loop(void) { o->oSLWalkingPenguinCurStep = 0; o->oSLWalkingPenguinCurStepTimer = 0; } - + if (o->oSLWalkingPenguinCurStepTimer < sSLWalkingPenguinErraticSteps[o->oSLWalkingPenguinCurStep].stepLength) o->oSLWalkingPenguinCurStepTimer++; else { @@ -59,57 +59,57 @@ void bhv_sl_walking_penguin_loop(void) { // Reached the end of the list, go back to the start o->oSLWalkingPenguinCurStep = 0; } - + if (o->oPosX < 300.0f) o->oAction++; // If reached the end of the bridge, turn around and head back. else { // Move and animate the penguin o->oForwardVel = sSLWalkingPenguinErraticSteps[o->oSLWalkingPenguinCurStep].speed; - + cur_obj_init_animation_with_accel_and_sound( sSLWalkingPenguinErraticSteps[o->oSLWalkingPenguinCurStep].anim, sSLWalkingPenguinErraticSteps[o->oSLWalkingPenguinCurStep].animSpeed ); } break; - + // At the end, turn around and prepare to head back across the bridge. case SL_WALKING_PENGUIN_ACT_TURNING_BACK: if (sl_walking_penguin_turn()) o->oAction++; // Finished turning break; - + // Walk back across the bridge at a constant speed. case SL_WALKING_PENGUIN_ACT_RETURNING: // Move and animate the penguin o->oForwardVel = 12.0f; cur_obj_init_animation_with_accel_and_sound(PENGUIN_ANIM_WALK, 2.0f); - + if (o->oPosX > 1700.0f) o->oAction++; // If reached the start of the bridge, turn around. break; - + // At the start, turn around and prepare to walk erratically across the bridge. case SL_WALKING_PENGUIN_ACT_TURNING_FORWARDS: if (sl_walking_penguin_turn()) o->oAction = SL_WALKING_PENGUIN_ACT_MOVING_FORWARDS; // Finished turning break; } - + cur_obj_move_standard(-78); if (!cur_obj_hide_if_mario_far_away_y(1000.0f)) play_penguin_walking_sound(PENGUIN_WALK_BIG); - + // Adjust the position to get a point better lined up with the visual model, for stopping the wind. // The new point is 60 units behind the penguin and 100 units perpedicularly, away from the snowman. - + adjustedXPos = o->oPosX + sins(0xDBB0) * 60.0f; // 0xDBB0 = -51 degrees, the angle the penguin is facing adjustedZPos = o->oPosZ + coss(0xDBB0) * 60.0f; adjustedXPos += perpendicularOffset * sins(0x1BB0); // 0x1BB0 = 39 degrees, perpendicular to the penguin adjustedZPos += perpendicularOffset * coss(0x1BB0); o->oSLWalkingPenguinWindCollisionXPos = adjustedXPos; o->oSLWalkingPenguinWindCollisionZPos = adjustedZPos; - + print_debug_bottom_up("x %d", o->oPosX); print_debug_bottom_up("z %d", o->oPosZ); } diff --git a/src/game/behaviors/snufit.inc.c b/src/game/behaviors/snufit.inc.c index f3a0c9ef..128527f2 100644 --- a/src/game/behaviors/snufit.inc.c +++ b/src/game/behaviors/snufit.inc.c @@ -30,7 +30,7 @@ struct ObjectHitbox sSnufitBulletHitbox = { }; /** - * This geo function shifts snufit's mask when it shrinks down, + * This geo function shifts snufit's mask when it shrinks down, * since the parts move independently. */ Gfx *geo_snufit_move_mask(s32 callContext, struct GraphNode *node, UNUSED Mat4 *c) { @@ -77,7 +77,7 @@ void snufit_act_idle(void) { // if the game would not have already crashed. marioDist = (s32)(o->oDistanceToMario / 10.0f); if (o->oTimer > marioDist && o->oDistanceToMario < 800.0f) { - + // Controls an alternating scaling factor in a cos. o->oSnufitBodyScalePeriod = approach_s16_symmetric(o->oSnufitBodyScalePeriod, 0, 1500); @@ -121,7 +121,7 @@ void bhv_snufit_loop(void) { // Only update if Mario is in the current room. if (!(o->activeFlags & ACTIVE_FLAG_IN_DIFFERENT_ROOM)) { o->oDeathSound = SOUND_OBJ_SNUFIT_SKEETER_DEATH; - + // Face Mario if he is within range. if (o->oDistanceToMario < 800.0f) { obj_turn_pitch_toward_mario(120.0f, 2000); @@ -198,7 +198,7 @@ void bhv_snufit_balls_loop(void) { o->oGravity = -4.0f; cur_obj_become_intangible(); - } else if (o->oAction == 1 + } else if (o->oAction == 1 || (o->oMoveFlags & (OBJ_MOVE_MASK_ON_GROUND | OBJ_MOVE_HIT_WALL))) { // The Snufit shot Mario and has fulfilled its lonely existance. //! The above check could theoretically be avoided by finding a geometric diff --git a/src/game/behaviors/star_door.inc.c b/src/game/behaviors/star_door.inc.c index c5b499b9..4a9f2307 100644 --- a/src/game/behaviors/star_door.inc.c +++ b/src/game/behaviors/star_door.inc.c @@ -8,7 +8,6 @@ void star_door_update_pos(void) { } void bhv_star_door_loop(void) { - UNUSED u8 pad[4]; struct Object *doorObj; doorObj = cur_obj_nearest_object_with_behavior(bhvStarDoor); switch (o->oAction) { diff --git a/src/game/behaviors/strong_wind_particle.inc.c b/src/game/behaviors/strong_wind_particle.inc.c index 50cd04be..03ee7500 100644 --- a/src/game/behaviors/strong_wind_particle.inc.c +++ b/src/game/behaviors/strong_wind_particle.inc.c @@ -16,24 +16,24 @@ void bhv_strong_wind_particle_loop(void) { struct Object *penguinObj; f32 distanceFromPenguin; f32 penguinXDist, penguinZDist; - + obj_set_hitbox(o, &sStrongWindParticleHitbox); - + if (o->oTimer == 0) { o->oStrongWindParticlePenguinObj = cur_obj_nearest_object_with_behavior(bhvSLWalkingPenguin); obj_translate_xyz_random(o, 100.0f); - + o->oForwardVel = coss(o->oMoveAnglePitch) * 100.0f; o->oVelY = sins(o->oMoveAnglePitch) * -100.0f; - + o->oMoveAngleYaw += random_f32_around_zero(o->oBehParams2ndByte * 500); // Wind spread o->oOpacity = 100; } - + cur_obj_move_using_fvel_and_gravity(); if (o->oTimer > 15) // Deactivate after 15 frames obj_mark_for_deletion(o); - + // If collided with the SL walking penguin, deactivate. penguinObj = o->oStrongWindParticlePenguinObj; if (penguinObj != NULL) { diff --git a/src/game/behaviors/tilting_inverted_pyramid.inc.c b/src/game/behaviors/tilting_inverted_pyramid.inc.c index 32bdf4a1..1e56addc 100644 --- a/src/game/behaviors/tilting_inverted_pyramid.inc.c +++ b/src/game/behaviors/tilting_inverted_pyramid.inc.c @@ -79,9 +79,7 @@ void bhv_tilting_inverted_pyramid_loop(void) { f32 mz; s32 marioOnPlatform = FALSE; - UNUSED s32 unused; Mat4 *transform = &o->transform; - UNUSED s32 unused2[7]; if (gMarioObject->platform == o) { get_mario_pos(&mx, &my, &mz); @@ -95,7 +93,7 @@ void bhv_tilting_inverted_pyramid_loop(void) { dy = 500.0f; dz = gMarioObject->oPosZ - o->oPosZ; d = sqrtf(dx * dx + dy * dy + dz * dz); - + //! Always true since dy = 500, making d >= 500. if (d != 0.0f) { // Normalizing @@ -120,7 +118,7 @@ void bhv_tilting_inverted_pyramid_loop(void) { o->oTiltingPyramidMarioOnPlatform = FALSE; } - // Approach the normals by 0.01f towards the new goal, then create a transform matrix and orient the object. + // Approach the normals by 0.01f towards the new goal, then create a transform matrix and orient the object. // Outside of the other conditionals since it needs to tilt regardless of whether Mario is on. o->oTiltingPyramidNormalX = approach_by_increment(dx, o->oTiltingPyramidNormalX, 0.01f); o->oTiltingPyramidNormalY = approach_by_increment(dy, o->oTiltingPyramidNormalY, 0.01f); diff --git a/src/game/behaviors/tower_platform.inc.c b/src/game/behaviors/tower_platform.inc.c index 2bf4ce34..86ad99e8 100644 --- a/src/game/behaviors/tower_platform.inc.c +++ b/src/game/behaviors/tower_platform.inc.c @@ -69,7 +69,6 @@ void spawn_and_init_wf_platforms(s16 a, const BehaviorScript *bhv) { } void spawn_wf_platform_group(void) { - UNUSED s32 unused = 8; o->oPlatformSpawnerWFTowerPlatformNum = 0; o->oPlatformSpawnerWFTowerYawOffset = 0; o->oPlatformSpawnerWFTowerDYaw = 0x2000; diff --git a/src/game/behaviors/tree_particles.inc.c b/src/game/behaviors/tree_particles.inc.c index 34c2e02c..a01c4ffa 100644 --- a/src/game/behaviors/tree_particles.inc.c +++ b/src/game/behaviors/tree_particles.inc.c @@ -37,10 +37,8 @@ void bhv_snow_leaf_particle_spawn_init(void) { #ifdef TREE_PARTICLE_FIX struct Object *nearestTree = NULL; #endif - UNUSED s32 unused; s32 isSnow; f32 scale; - UNUSED s32 unused2; gMarioObject->oActiveParticleFlags &= ~0x2000; #ifdef TREE_PARTICLE_FIX nearestTree = cur_obj_nearest_object_with_behavior(bhvTree); diff --git a/src/game/behaviors/tuxie.inc.c b/src/game/behaviors/tuxie.inc.c index a2c53193..57fdf9e1 100644 --- a/src/game/behaviors/tuxie.inc.c +++ b/src/game/behaviors/tuxie.inc.c @@ -52,7 +52,7 @@ void tuxies_mother_act_1(void) { dialogID = DIALOG_058; else dialogID = DIALOG_059; - if (cur_obj_update_dialog_with_cutscene(MARIO_DIALOG_LOOK_UP, + if (cur_obj_update_dialog_with_cutscene(MARIO_DIALOG_LOOK_UP, DIALOG_FLAG_TURN_TO_MARIO, CUTSCENE_DIALOG, dialogID)) { if (dialogID == DIALOG_058) o->oSubAction = 1; @@ -115,7 +115,7 @@ void tuxies_mother_act_0(void) { o->oSubAction++; break; case 1: - if (cur_obj_update_dialog_with_cutscene(MARIO_DIALOG_LOOK_UP, + if (cur_obj_update_dialog_with_cutscene(MARIO_DIALOG_LOOK_UP, DIALOG_FLAG_TURN_TO_MARIO, CUTSCENE_DIALOG, DIALOG_057)) o->oSubAction++; break; diff --git a/src/game/behaviors/tweester.inc.c b/src/game/behaviors/tweester.inc.c index 67ad5f2d..7abcbb7c 100644 --- a/src/game/behaviors/tweester.inc.c +++ b/src/game/behaviors/tweester.inc.c @@ -25,11 +25,11 @@ void tweester_scale_and_move(f32 preScale) { s16 dYaw = 0x2C00; f32 scale = preScale * 0.4; - o->header.gfx.scale[0] + o->header.gfx.scale[0] = (( coss(o->oTweesterScaleTimer) + 1.0) * 0.5 * 0.3 + 1.0) * scale; - o->header.gfx.scale[1] + o->header.gfx.scale[1] = ((-coss(o->oTweesterScaleTimer) + 1.0) * 0.5 * 0.5 + 0.5) * scale; - o->header.gfx.scale[2] + o->header.gfx.scale[2] = (( coss(o->oTweesterScaleTimer) + 1.0) * 0.5 * 0.3 + 1.0) * scale; o->oTweesterScaleTimer += 0x200; @@ -125,7 +125,7 @@ void tweester_act_hide(void) { void (*sTweesterActions[])(void) = { tweester_act_idle, tweester_act_chase, tweester_act_hide }; /** - * Loop behavior for Tweester. + * Loop behavior for Tweester. * Loads the hitbox and calls its relevant action. */ void bhv_tweester_loop(void) { diff --git a/src/game/behaviors/ukiki.inc.c b/src/game/behaviors/ukiki.inc.c index 45854449..0e94dadd 100644 --- a/src/game/behaviors/ukiki.inc.c +++ b/src/game/behaviors/ukiki.inc.c @@ -174,8 +174,6 @@ void ukiki_act_idle(void) { * Only used for the cap ukiki. */ void ukiki_act_return_home(void) { - UNUSED s32 unused; - cur_obj_init_animation_with_sound(UKIKI_ANIM_RUN); o->oMoveAngleYaw = cur_obj_angle_to_home(); o->oForwardVel = 10.0f; @@ -383,7 +381,7 @@ void ukiki_act_go_to_cage(void) { case UKIKI_SUB_ACT_CAGE_TALK_TO_MARIO: cur_obj_init_animation_with_sound(UKIKI_ANIM_HANDSTAND); - if (cur_obj_update_dialog_with_cutscene(MARIO_DIALOG_LOOK_DOWN, + if (cur_obj_update_dialog_with_cutscene(MARIO_DIALOG_LOOK_DOWN, DIALOG_FLAG_TURN_TO_MARIO, CUTSCENE_DIALOG, DIALOG_080)) { o->oSubAction++; } @@ -578,7 +576,7 @@ void cap_ukiki_held_loop(void) { break; case UKIKI_TEXT_HAS_CAP: - if (cur_obj_update_dialog(MARIO_DIALOG_LOOK_UP, + if (cur_obj_update_dialog(MARIO_DIALOG_LOOK_UP, (DIALOG_FLAG_TEXT_DEFAULT | DIALOG_FLAG_TIME_STOP_ENABLED), DIALOG_101, 0)) { mario_retrieve_cap(); set_mario_npc_dialog(MARIO_DIALOG_STOP); diff --git a/src/game/behaviors/water_splashes_and_waves.inc.c b/src/game/behaviors/water_splashes_and_waves.inc.c index 8c328772..da54d595 100644 --- a/src/game/behaviors/water_splashes_and_waves.inc.c +++ b/src/game/behaviors/water_splashes_and_waves.inc.c @@ -57,7 +57,6 @@ void bhv_water_splash_spawn_droplets(void) { } void bhv_water_droplet_loop(void) { - UNUSED u32 unusedVar; f32 waterLevel = find_water_level(o->oPosX, o->oPosZ); if (o->oTimer == 0) { diff --git a/src/game/behaviors/whomp.inc.c b/src/game/behaviors/whomp.inc.c index b8ab613a..faa60853 100644 --- a/src/game/behaviors/whomp.inc.c +++ b/src/game/behaviors/whomp.inc.c @@ -28,7 +28,7 @@ void whomp_init(void) { cur_obj_set_pos_to_home(); o->oHealth = 3; } - } else if (cur_obj_update_dialog_with_cutscene(MARIO_DIALOG_LOOK_UP, + } else if (cur_obj_update_dialog_with_cutscene(MARIO_DIALOG_LOOK_UP, DIALOG_FLAG_TURN_TO_MARIO, CUTSCENE_DIALOG, DIALOG_114)) o->oAction = 2; } else if (o->oDistanceToMario < 500.0f) @@ -216,7 +216,7 @@ void whomp_on_ground_general(void) { void whomp_die(void) { if (o->oBehParams2ndByte != 0) { - if (cur_obj_update_dialog_with_cutscene(MARIO_DIALOG_LOOK_UP, + if (cur_obj_update_dialog_with_cutscene(MARIO_DIALOG_LOOK_UP, DIALOG_FLAG_TEXT_DEFAULT, CUTSCENE_DIALOG, DIALOG_115)) { obj_set_angle(o, 0, 0, 0); cur_obj_hide(); diff --git a/src/game/behaviors/wiggler.inc.c b/src/game/behaviors/wiggler.inc.c index 44c52ba2..785daca4 100644 --- a/src/game/behaviors/wiggler.inc.c +++ b/src/game/behaviors/wiggler.inc.c @@ -299,7 +299,7 @@ static void wiggler_act_jumped_on(void) { // defeated) or go back to walking if (o->header.gfx.scale[1] >= 4.0f) { if (o->oTimer > 30) { - if (cur_obj_update_dialog_with_cutscene(MARIO_DIALOG_LOOK_UP, + if (cur_obj_update_dialog_with_cutscene(MARIO_DIALOG_LOOK_UP, DIALOG_FLAG_NONE, CUTSCENE_DIALOG, attackText[o->oHealth - 2])) { // Because we don't want the wiggler to disappear after being // defeated, we leave its health at 1 diff --git a/src/game/camera.c b/src/game/camera.c index 619b13d7..260aea67 100644 --- a/src/game/camera.c +++ b/src/game/camera.c @@ -122,17 +122,12 @@ extern f32 sHandheldShakeInc; extern s16 sHandheldShakePitch; extern s16 sHandheldShakeYaw; extern s16 sHandheldShakeRoll; -extern u32 unused8033B30C; -extern u32 unused8033B310; extern s16 sSelectionFlags; -extern s16 unused8033B316; extern s16 s2ndRotateFlags; -extern s16 unused8033B31A; extern s16 sCameraSoundFlags; extern u16 sCButtonsPressed; extern s16 sCutsceneDialogID; extern struct LakituState gLakituState; -extern s16 unused8033B3E8; extern s16 sAreaYaw; extern s16 sAreaYawChange; extern s16 sLakituDist; @@ -161,7 +156,6 @@ extern struct CutsceneSplinePoint sCurCreditsSplinePos[32]; extern struct CutsceneSplinePoint sCurCreditsSplineFocus[32]; extern s16 sCutsceneSplineSegment; extern f32 sCutsceneSplineSegmentProgress; -extern s16 unused8033B6E8; extern s16 sCutsceneShot; extern s16 gCutsceneTimer; extern struct CutsceneVariable sCutsceneVars[10]; @@ -204,7 +198,6 @@ f32 sCutsceneSplineSegmentProgress; * The current segment of the CutsceneSplinePoint[] being used. */ s16 sCutsceneSplineSegment; -s16 unused8033B6E8; // Shaky Hand-held Camera effect variables struct HandheldShakePoint sHandheldShakeSpline[4]; @@ -225,9 +218,6 @@ u32 gCutsceneObjSpawn; */ s32 gObjCutsceneDone; -u32 unused8033B30C; -u32 unused8033B310; - /** * Determines which R-Trigger mode is selected in the pause menu. */ @@ -237,7 +227,6 @@ s16 sSelectionFlags; * Flags that determine what movements the camera should start / do this frame. */ s16 gCameraMovementFlags; -s16 unused8033B316; /** * Flags that change how modes operate and how Lakitu moves. @@ -250,7 +239,6 @@ s16 sStatusFlags; * determine whether to rotate all the way, or just to 60 degrees. */ s16 s2ndRotateFlags; -s16 unused8033B31A; /** * Flags that control buzzes and sounds that play, mostly for C-button input. */ @@ -271,10 +259,7 @@ s16 sCutsceneShot; * The current frame of the cutscene shot. */ s16 gCutsceneTimer; -s16 unused8033B3E8; -#if defined(VERSION_EU) || defined(VERSION_SH) -s16 unused8033B3E82; -#endif + /** * The angle of the direction vector from the area's center to Mario's position. */ @@ -389,12 +374,8 @@ struct CameraStoredInfo sCameraStoreCUp; struct CameraStoredInfo sCameraStoreCutscene; // first iteration of data -u32 unused8032CFC0 = 0; struct Object *gCutsceneFocus = NULL; -u32 unused8032CFC8 = 0; -u32 unused8032CFCC = 0; - /** * The information of a second focus camera used by some objects */ @@ -407,9 +388,6 @@ s16 sYawSpeed = 0x400; s32 gCurrLevelArea = 0; u32 gPrevLevel = 0; -f32 unused8032CFE0 = 1000.0f; -f32 unused8032CFE4 = 800.0f; -u32 unused8032CFE8 = 0; f32 gCameraZoomDist = 800.0f; /** @@ -439,7 +417,6 @@ u8 sFramesSinceCutsceneEnded = 0; u8 sCutsceneDialogResponse = DIALOG_RESPONSE_NONE; struct PlayerCameraState *sMarioCamState = &gPlayerCameraState[0]; struct PlayerCameraState *sLuigiCamState = &gPlayerCameraState[1]; -u32 unused8032D008 = 0; Vec3f sFixedModeBasePosition = { 646.0f, 143.0f, -1513.0f }; Vec3f sUnusedModeBasePosition_2 = { 646.0f, 143.0f, -1513.0f }; Vec3f sUnusedModeBasePosition_3 = { 646.0f, 143.0f, -1513.0f }; @@ -723,12 +700,8 @@ void focus_on_mario(Vec3f focus, Vec3f pos, f32 posYOff, f32 focYOff, f32 dist, static UNUSED void set_pos_to_mario(Vec3f foc, Vec3f pos, f32 yOff, f32 focYOff, f32 dist, s16 pitch, s16 yaw) { Vec3f marioPos; f32 posDist; - f32 focDist; - s16 posPitch; s16 posYaw; - s16 focPitch; - s16 focYaw; vec3f_copy(marioPos, sMarioCamState->pos); marioPos[1] += yOff; @@ -899,11 +872,8 @@ s32 update_radial_camera(struct Camera *c, Vec3f focus, Vec3f pos) { f32 cenDistZ = sMarioCamState->pos[2] - c->areaCenZ; s16 camYaw = atan2s(cenDistZ, cenDistX) + sModeOffsetYaw; s16 pitch = look_down_slopes(camYaw); - UNUSED f32 unused1; f32 posY; f32 focusY; - UNUSED f32 unused2; - UNUSED f32 unused3; f32 yOff = 125.f; f32 baseDist = 1000.f; @@ -919,15 +889,10 @@ s32 update_radial_camera(struct Camera *c, Vec3f focus, Vec3f pos) { * Update the camera during 8 directional mode */ s32 update_8_directions_camera(struct Camera *c, Vec3f focus, Vec3f pos) { - UNUSED f32 cenDistX = sMarioCamState->pos[0] - c->areaCenX; - UNUSED f32 cenDistZ = sMarioCamState->pos[2] - c->areaCenZ; s16 camYaw = s8DirModeBaseYaw + s8DirModeYawOffset; s16 pitch = look_down_slopes(camYaw); f32 posY; f32 focusY; - UNUSED f32 unused1; - UNUSED f32 unused2; - UNUSED f32 unused3; f32 yOff = 125.f; f32 baseDist = 1000.f; @@ -953,11 +918,8 @@ void radial_camera_move(struct Camera *c) { s16 rotateSpeed = 0x1000; s16 avoidYaw; s32 avoidStatus; - UNUSED s16 unused1 = 0; - UNUSED s32 unused2 = 0; f32 areaDistX = sMarioCamState->pos[0] - c->areaCenX; f32 areaDistZ = sMarioCamState->pos[2] - c->areaCenZ; - UNUSED s32 filler; // How much the camera's yaw changed s16 yawOffset = calculate_yaw(sMarioCamState->pos, c->pos) - atan2s(areaDistZ, areaDistX); @@ -1139,9 +1101,7 @@ void update_yaw_and_dist_from_c_up(UNUSED struct Camera *c) { */ void mode_radial_camera(struct Camera *c) { Vec3f pos; - UNUSED u8 unused1[8]; s16 oldAreaYaw = sAreaYaw; - UNUSED u8 unused2[4]; if (gCameraMovementFlags & CAM_MOVING_INTO_MODE) { update_yaw_and_dist_from_c_up(c); @@ -1270,34 +1230,21 @@ s32 update_parallel_tracking_camera(struct Camera *c, Vec3f focus, Vec3f pos) { Vec3f focOffset; s16 pathPitch; s16 pathYaw; - UNUSED u8 filler[4]; f32 distThresh; f32 zoom; f32 camParDist; - UNUSED u8 filler2[8]; f32 pathLength; - UNUSED u8 filler3[8]; - UNUSED f32 unusedScale = 0.5f; f32 parScale = 0.5f; f32 marioFloorDist; Vec3f marioPos; - UNUSED u8 filler4[12]; - UNUSED Vec3f unused4; Vec3s pathAngle; // Variables for changing to the next/prev path in the list Vec3f oldPos; Vec3f prevPathPos; Vec3f nextPathPos; - f32 distToNext; - f32 distToPrev; - s16 prevPitch; - s16 nextPitch; - s16 prevYaw; - s16 nextYaw; - - unused4[0] = 0.f; - unused4[1] = 0.f; - unused4[2] = 0.f; + f32 distToNext, distToPrev; + s16 prevPitch, nextPitch; + s16 prevYaw, nextYaw; // Store camera pos, for changing between paths vec3f_copy(oldPos, pos); @@ -1456,14 +1403,12 @@ s32 update_fixed_camera(struct Camera *c, Vec3f focus, UNUSED Vec3f pos) { f32 ceilHeight; f32 heightOffset; f32 distCamToFocus; - UNUSED u8 filler2[8]; f32 scaleToMario = 0.5f; s16 pitch; s16 yaw; Vec3s faceAngle; struct Surface *ceiling; Vec3f basePos; - UNUSED u8 filler[12]; play_camera_buzz_if_c_sideways(); @@ -1543,21 +1488,16 @@ s32 update_fixed_camera(struct Camera *c, Vec3f focus, UNUSED Vec3f pos) { */ s32 update_boss_fight_camera(struct Camera *c, Vec3f focus, Vec3f pos) { struct Object *o; - UNUSED u8 filler2[12]; f32 focusDistance; - UNUSED u8 filler3[4]; // Floor normal values f32 nx; f32 ny; f32 nz; /// Floor originOffset f32 oo; - UNUSED u8 filler4[4]; - UNUSED s16 unused; s16 yaw; s16 heldState; struct Surface *floor; - UNUSED u8 filler[20]; Vec3f secondFocus; Vec3f holdFocOffset = { 0.f, -150.f, -125.f }; @@ -1668,10 +1608,6 @@ s32 update_boss_fight_camera(struct Camera *c, Vec3f focus, Vec3f pos) { return yaw; } -// 2nd iteration of data -s16 unused8032D0A8[] = { 14, 1, 2, 4 }; -s16 unused8032D0B0[] = { 16, 9, 17, 0 }; - /** * Maps cutscene to numbers in [0,4]. Used in determine_dance_cutscene() with sDanceCutsceneIndexTable. * @@ -1746,8 +1682,6 @@ void mode_parallel_tracking_camera(struct Camera *c) { * Fixed camera mode, the camera rotates around a point and looks and zooms toward Mario. */ void mode_fixed_camera(struct Camera *c) { - UNUSED u8 unused[8]; - if (gCurrLevelNum == LEVEL_BBH) { set_fov_function(CAM_FOV_BBH); } else { @@ -1765,9 +1699,7 @@ void mode_fixed_camera(struct Camera *c) { * The C-Buttons rotate the camera 90 degrees left/right and 67.5 degrees up/down. */ s32 update_behind_mario_camera(struct Camera *c, Vec3f focus, Vec3f pos) { - UNUSED u8 unused2[12]; f32 dist; - UNUSED u8 unused3[4]; s16 absPitch; s16 pitch; s16 yaw; @@ -1776,7 +1708,6 @@ s32 update_behind_mario_camera(struct Camera *c, Vec3f focus, Vec3f pos) { s16 goalYawOff = 0; s16 yawSpeed; s16 pitchInc = 32; - UNUSED u8 unused[12]; f32 maxDist = 800.f; f32 focYOff = 125.f; @@ -1792,10 +1723,6 @@ s32 update_behind_mario_camera(struct Camera *c, Vec3f focus, Vec3f pos) { // Focus on Mario vec3f_copy(focus, sMarioCamState->pos); c->focus[1] += focYOff; - //! @bug unnecessary - dist = calc_abs_dist(focus, pos); - //! @bug unnecessary - pitch = calculate_pitch(focus, pos); vec3f_get_dist_and_angle(focus, pos, &dist, &pitch, &yaw); if (dist > maxDist) { dist = maxDist; @@ -1915,7 +1842,7 @@ s32 mode_behind_mario(struct Camera *c) { struct Surface *floor; Vec3f newPos; //! @bug oldPos is unused, see resolve_geometry_collisions - Vec3f oldPos; + UNUSED Vec3f oldPos; f32 waterHeight; f32 floorHeight; f32 distCamToFocus; @@ -1972,7 +1899,6 @@ s16 update_slide_camera(struct Camera *c) { f32 pitchScale; s16 camPitch; s16 camYaw; - UNUSED struct MarioState *marioState = &gMarioStates[0]; s16 goalPitch = 0x1555; s16 goalYaw = sMarioCamState->faceAngle[1] + DEGREES(180); @@ -2072,7 +1998,6 @@ s32 update_mario_camera(UNUSED struct Camera *c, Vec3f focus, Vec3f pos) { s16 update_default_camera(struct Camera *c) { Vec3f tempPos; Vec3f cPos; - UNUSED u8 unused1[12]; struct Surface *marioFloor; struct Surface *cFloor; struct Surface *tempFloor; @@ -2080,11 +2005,9 @@ s16 update_default_camera(struct Camera *c) { f32 camFloorHeight; f32 tempFloorHeight; f32 marioFloorHeight; - UNUSED u8 unused2[4]; f32 dist; f32 zoomDist; - f32 waterHeight; - f32 gasHeight; + f32 waterHeight, gasHeight; s16 avoidYaw; s16 pitch; s16 yaw; @@ -2092,10 +2015,8 @@ s16 update_default_camera(struct Camera *c) { f32 posHeight; f32 focHeight; f32 distFromWater; - s16 tempPitch; - s16 tempYaw; + s16 tempPitch, tempYaw; f32 xzDist; - UNUSED u8 unused4[4]; s16 nextYawVel; s16 yawVel = 0; f32 scale; @@ -2422,7 +2343,6 @@ void mode_mario_camera(struct Camera *c) { * Rotates the camera around the spiral staircase. */ s32 update_spiral_stairs_camera(struct Camera *c, Vec3f focus, Vec3f pos) { - UNUSED s16 unused1; /// The returned yaw s16 camYaw; // unused @@ -2433,7 +2353,6 @@ s32 update_spiral_stairs_camera(struct Camera *c, Vec3f focus, Vec3f pos) { s16 posPitch; /// The camera's yaw around the stairs s16 posYaw; - UNUSED s32 unused2; Vec3f cPos; Vec3f checkPos; struct Surface *floor; @@ -2738,8 +2657,6 @@ void move_into_c_up(struct Camera *c) { * The main update function for C-Up mode */ s32 mode_c_up_camera(struct Camera *c) { - UNUSED u8 unused[12]; - // Play a sound when entering C-Up mode if (!(sCameraSoundFlags & CAM_SOUND_C_UP_PLAYED)) { play_sound_cbutton_up(); @@ -2796,8 +2713,6 @@ s32 update_in_cannon(UNUSED struct Camera *c, Vec3f focus, Vec3f pos) { * sCannonYOffset is used to make the camera rotate down when Mario has just entered the cannon */ void mode_cannon_camera(struct Camera *c) { - UNUSED u8 unused[24]; - sLakituPitch = 0; gCameraMovementFlags &= ~CAM_MOVING_INTO_MODE; c->nextYaw = update_in_cannon(c, c->focus, c->pos); @@ -2921,10 +2836,8 @@ void update_lakitu(struct Camera *c) { struct Surface *floor = NULL; Vec3f newPos; Vec3f newFoc; - UNUSED Vec3f unusedVec3f; f32 distToFloor; s16 newYaw; - UNUSED u8 unused1[8]; if (gCameraMovementFlags & CAM_MOVE_PAUSE_SCREEN) { } else { @@ -3023,8 +2936,6 @@ void update_lakitu(struct Camera *c) { * Gets controller input, checks for cutscenes, handles mode changes, and moves the camera */ void update_camera(struct Camera *c) { - UNUSED u8 unused[24]; - gCamera = c; update_camera_hud_status(c); if (c->cutscene == 0 && @@ -3269,11 +3180,6 @@ void update_camera(struct Camera *c) { * Reset all the camera variables to their arcane defaults */ void reset_camera(struct Camera *c) { - UNUSED s32 unused = 0; - UNUSED u8 unused1[16]; - UNUSED struct LinearTransitionPoint *start = &sModeInfo.transitionStart; - UNUSED struct LinearTransitionPoint *end = &sModeInfo.transitionEnd; - gCamera = c; gCameraMovementFlags = 0; s2ndRotateFlags = 0; @@ -3283,19 +3189,13 @@ void reset_camera(struct Camera *c) { gCutsceneObjSpawn = 0; gObjCutsceneDone = FALSE; gCutsceneFocus = NULL; - unused8032CFC8 = 0; - unused8032CFCC = 0; gSecondCameraFocus = NULL; sCButtonsPressed = 0; vec3f_copy(sModeTransition.marioPos, sMarioCamState->pos); sModeTransition.framesLeft = 0; - unused8032CFCC = -1; - unused8032CFC8 = -1; gCameraMovementFlags = 0; gCameraMovementFlags |= CAM_MOVE_INIT_CAMERA; - unused8033B316 = 0; sStatusFlags = 0; - unused8033B31A = 0; sCameraSoundFlags = 0; sCUpCameraPitch = 0; sModeOffsetYaw = 0; @@ -3337,8 +3237,6 @@ void reset_camera(struct Camera *c) { sFOVState.shakePhase = 0; sObjectCutscene = 0; gRecentCutscene = 0; - unused8033B30C = 0; - unused8033B310 = 0; } void init_camera(struct Camera *c) { @@ -3377,7 +3275,6 @@ void init_camera(struct Camera *c) { } sCutsceneSplineSegment = 0; sCutsceneSplineSegmentProgress = 0.f; - unused8033B6E8 = 0; sHandheldShakeInc = 0.f; sHandheldShakeTimer = 0.f; sHandheldShakeMag = 0; @@ -3521,11 +3418,9 @@ void init_camera(struct Camera *c) { * modulo-4's the result, because each 8-bit mask only has 4 area bits for each level */ void zoom_out_if_paused_and_outside(struct GraphNodeCamera *camera) { - UNUSED u8 unused1[8]; UNUSED f32 dist; UNUSED s16 pitch; s16 yaw; - UNUSED u8 unused2[4]; s32 areaMaskIndex = gCurrLevelArea / 32; s32 areaBit = 1 << (((gCurrLevelArea & 0x10) / 4) + (((gCurrLevelArea & 0xF) - 1) & 3)); @@ -3582,9 +3477,6 @@ void create_camera(struct GraphNodeCamera *gc, struct AllocOnlyPool *pool) { * Copy Lakitu's pos and foc into `gc` */ void update_graph_node_camera(struct GraphNodeCamera *gc) { - UNUSED u8 unused[8]; - UNUSED struct Camera *c = gc->config.camera; - gc->rollScreen = gLakituState.roll; vec3f_copy(gc->pos, gLakituState.pos); vec3f_copy(gc->focus, gLakituState.focus); @@ -3593,8 +3485,6 @@ void update_graph_node_camera(struct GraphNodeCamera *gc) { Gfx *geo_camera_main(s32 callContext, struct GraphNode *g, void *context) { struct GraphNodeCamera *gc = (struct GraphNodeCamera *) g; - UNUSED Mat4 *unusedMat = context; - switch (callContext) { case GEO_CONTEXT_CREATE: create_camera(gc, context); @@ -3845,7 +3735,6 @@ void shake_camera_handheld(Vec3f pos, Vec3f focus) { f32 dist; s16 pitch; s16 yaw; - UNUSED u8 unused[8]; if (sHandheldShakeMag == 0) { vec3f_set(shakeOffset, 0.f, 0.f, 0.f); @@ -4282,7 +4171,6 @@ f32 camera_approach_f32_symmetric(f32 current, f32 target, f32 increment) { */ void random_vec3s(Vec3s dst, s16 xRange, s16 yRange, s16 zRange) { f32 randomFloat; - UNUSED u8 unused[4]; f32 tempXRange; f32 tempYRange; f32 tempZRange; @@ -4377,12 +4265,7 @@ s32 clamp_positions_and_find_yaw(Vec3f pos, Vec3f origin, f32 xMax, f32 xMin, f3 * developers just add 180 degrees to the result. */ s32 calc_avoid_yaw(s16 yawFromMario, s16 wallYaw) { - s16 yawDiff; - UNUSED u8 unused[34]; // Debug print buffer? ;) - UNUSED s32 unused1 = 0; - UNUSED s32 unused2 = 0; - - yawDiff = wallYaw - yawFromMario + DEGREES(90); + s16 yawDiff = wallYaw - yawFromMario + DEGREES(90); if (yawDiff < 0) { // Deflect to the right @@ -4416,7 +4299,6 @@ s32 is_surf_within_bounding_box(struct Surface *surf, f32 xMax, f32 yMax, f32 zM f32 dx; f32 dy; f32 dz; - UNUSED u8 unused[4]; s32 i; s32 j; // result @@ -4494,7 +4376,6 @@ s32 is_range_behind_surface(Vec3f from, Vec3f to, struct Surface *surf, s16 rang s32 behindSurface = TRUE; s32 leftBehind = 0; s32 rightBehind = 0; - UNUSED u8 unused[20]; f32 checkDist; s16 checkPitch; s16 checkYaw; @@ -4763,8 +4644,6 @@ void shake_camera_yaw(Vec3f pos, Vec3f focus) { * Apply a rotational shake to the camera by adjusting its roll */ void shake_camera_roll(s16 *roll) { - UNUSED u8 unused[8]; - if (gLakituState.shakeMagnitude[2] != 0) { increment_shake_offset(&gLakituState.shakeRollPhase, gLakituState.shakeRollVel); *roll += gLakituState.shakeMagnitude[2] * sins(gLakituState.shakeRollPhase); @@ -4999,7 +4878,6 @@ void radial_camera_input(struct Camera *c) { */ s32 trigger_cutscene_dialog(s32 trigger) { s32 result = 0; - UNUSED struct Camera *c = gCamera; if (trigger == 1) { start_object_cutscene_without_focus(CUTSCENE_READ_MESSAGE); @@ -5153,9 +5031,7 @@ u8 open_door_cutscene(u8 pullResult, u8 pushResult) { * @return the cutscene that should start, 0 if none */ u8 get_cutscene_from_mario_status(struct Camera *c) { - UNUSED u8 unused1[4]; u8 cutscene = c->cutscene; - UNUSED u8 unused2[12]; if (cutscene == 0) { // A cutscene started by an object, if any, will start if nothing else happened @@ -5342,7 +5218,6 @@ void stub_camera_4(UNUSED s32 a, UNUSED s32 b, UNUSED s32 c, UNUSED s32 d) { */ void set_focus_rel_mario(struct Camera *c, f32 leftRight, f32 yOff, f32 forwBack, s16 yawOff) { s16 yaw; - UNUSED u16 unused; f32 focFloorYOff; calc_y_to_curr_floor(&focFloorYOff, 1.f, 200.f, &focFloorYOff, 0.9f, 200.f); @@ -6754,24 +6629,18 @@ void resolve_geometry_collisions(Vec3f pos, UNUSED Vec3f lastGood) { * @return 3 if a wall is covering Mario, 1 if a wall is only near the camera. */ s32 rotate_camera_around_walls(struct Camera *c, Vec3f cPos, s16 *avoidYaw, s16 yawRange) { - UNUSED f32 unused1; struct WallCollisionData colData; struct Surface *wall; - UNUSED Vec3f unused2; f32 dummyDist, checkDist; - UNUSED f32 unused3; f32 coarseRadius; f32 fineRadius; s16 wallYaw, horWallNorm; - UNUSED s16 unused4; s16 dummyPitch; // The yaw of the vector from Mario to the camera. s16 yawFromMario; - UNUSED s16 unused5; s32 status = 0; /// The current iteration. The algorithm takes 8 equal steps from Mario back to the camera. s32 step = 0; - UNUSED s32 unused6; vec3f_get_dist_and_angle(sMarioCamState->pos, cPos, &dummyDist, &dummyPitch, &yawFromMario); sStatusFlags &= ~CAM_FLAG_CAM_NEAR_WALL; @@ -6974,8 +6843,7 @@ void stop_cutscene_and_retrieve_stored_info(struct Camera *c) { vec3f_copy(c->pos, sCameraStoreCutscene.pos); } -void cap_switch_save(s16 dummy) { - UNUSED s16 unused = dummy; +void cap_switch_save(UNUSED s16 param) { save_file_do_save(gCurrSaveFileNum - 1); } @@ -6989,7 +6857,6 @@ void init_spline_point(struct CutsceneSplinePoint *splinePoint, s8 index, u8 spe void copy_spline_segment(struct CutsceneSplinePoint dst[], struct CutsceneSplinePoint src[]) { s32 j = 0; s32 i = 0; - UNUSED s32 pad[2]; init_spline_point(&dst[i], src[j].index, src[j].speed, src[j].point); i += 1; @@ -6998,7 +6865,7 @@ void copy_spline_segment(struct CutsceneSplinePoint dst[], struct CutsceneSpline init_spline_point(&dst[i], src[j].index, src[j].speed, src[j].point); i += 1; j += 1; - } while ((src[j].index != -1) && (src[j].index != -1)); //! same comparison performed twice + } while (src[j].index != -1); } while (j > 16); // Create the end of the spline by duplicating the last point @@ -7784,8 +7651,6 @@ void star_dance_bound_yaw(struct Camera *c, s16 absYaw, s16 yawMax) { * Store the camera's focus in cvar9. */ void cutscene_dance_closeup_start(struct Camera *c) { - UNUSED s32 pad[2]; - if ((gLastCompletedStarNum == 4) && (gCurrCourseNum == COURSE_JRB)) { star_dance_bound_yaw(c, 0x0, 0x4000); } @@ -8221,10 +8086,7 @@ void cutscene_star_spawn_store_info(struct Camera *c) { * Focus on the top of the star. */ void cutscene_star_spawn_focus_star(struct Camera *c) { - UNUSED f32 hMul; Vec3f starPos; - UNUSED f32 vMul; - if (gCutsceneFocus != NULL) { object_pos_to_vec3f(starPos, gCutsceneFocus); starPos[1] += gCutsceneFocus->hitboxHeight; @@ -8430,7 +8292,6 @@ void cutscene_red_coin_star_end(struct Camera *c) { * @param rotYaw constant yaw offset to add to the camera's focus */ void cutscene_goto_cvar_pos(struct Camera *c, f32 goalDist, s16 goalPitch, s16 rotPitch, s16 rotYaw) { - UNUSED f32 unused1; f32 nextDist; s16 nextPitch, nextYaw; // The next 2 polar coord points are only used in CUTSCENE_PREPARE_CANNON @@ -8438,7 +8299,6 @@ void cutscene_goto_cvar_pos(struct Camera *c, f32 goalDist, s16 goalPitch, s16 r s16 cannonPitch, cannonYaw; f32 curDist; s16 curPitch, curYaw; - UNUSED f64 unused2; vec3f_get_dist_and_angle(sCutsceneVars[3].point, c->pos, &nextDist, &nextPitch, &nextYaw); // If over 8000 units away from the cannon, just teleport there if ((nextDist > 8000.f) && (c->cutscene == CUTSCENE_PREPARE_CANNON)) { @@ -8698,12 +8558,8 @@ void cutscene_suffocation_fly_away(UNUSED struct Camera *c) { * Keep Lakitu above the gas level. */ void cutscene_suffocation_stay_above_gas(struct Camera *c) { - UNUSED f32 unused1; - f32 gasLevel; - UNUSED f32 unused2; - cutscene_goto_cvar_pos(c, 400.f, 0x2800, 0x200, 0); - gasLevel = find_poison_gas_level(sMarioCamState->pos[0], sMarioCamState->pos[2]); + f32 gasLevel = find_poison_gas_level(sMarioCamState->pos[0], sMarioCamState->pos[2]); if (gasLevel != FLOOR_LOWER_LIMIT) { if ((gasLevel += 130.f) > c->pos[1]) { @@ -8750,8 +8606,6 @@ void cutscene_enter_pool_start(struct Camera *c) { } void cutscene_enter_pool_loop(struct Camera *c) { - UNUSED u32 pad[2]; - cutscene_goto_cvar_pos(c, 1200.f, 0x2000, 0x200, 0); } @@ -8835,8 +8689,6 @@ void cutscene_pyramid_top_explode_cam_shake(UNUSED struct Camera *c) { * Warp back to the old position, and start a heavy camera shake. */ void cutscene_pyramid_top_explode_warp_back(struct Camera *c) { - UNUSED u32 pad[2]; - vec3f_copy(c->pos, sCutsceneVars[4].point); vec3f_copy(c->focus, sCutsceneVars[5].point); set_environmental_camera_shake(SHAKE_ENV_BOWSER_JUMP); @@ -8905,11 +8757,8 @@ UNUSED static void unused_cutscene_goto_cvar(struct Camera *c) { * cvar9.angle[1] is the yaw between Mario and the gCutsceneFocus */ void cutscene_dialog_start(struct Camera *c) { - UNUSED f32 unused1; - UNUSED s16 unused2; s16 yaw; - cutscene_soften_music(c); set_time_stop_flags(TIME_STOP_ENABLED | TIME_STOP_DIALOG); @@ -9063,8 +8912,6 @@ UNUSED static void unused_cam_to_mario(struct Camera *c) { * Cutscene that plays when Mario is reading a message (a sign or message on the wall) */ void cutscene_read_message(struct Camera *c) { - UNUSED u32 pad[2]; - cutscene_event(cutscene_read_message_start, c, 0, 0); sStatusFlags |= CAM_FLAG_SMOOTH_MOVEMENT; @@ -9130,9 +8977,7 @@ void cutscene_exit_succ_start(UNUSED struct Camera *c) { * Set the camera pos depending on which level Mario exited. */ void cutscene_non_painting_set_cam_pos(struct Camera *c) { - UNUSED u32 unused1; struct Surface *floor; - UNUSED Vec3f unused2; switch (gPrevLevel) { case LEVEL_HMC: @@ -9314,12 +9159,8 @@ void cutscene_non_painting_death(struct Camera *c) { * because cvar1 rotates until is reaches 0, so it's important that it's a multiple of 0x100. */ void cutscene_cap_switch_press_start(struct Camera *c) { - UNUSED s16 unused1; - s16 yaw; - UNUSED u32 pad[2]; - store_info_star(c); - yaw = calculate_yaw(sMarioCamState->pos, c->pos); + s16 yaw = calculate_yaw(sMarioCamState->pos, c->pos); sCutsceneVars[3].angle[1] = 0x1200; // Basically the amount of rotation to get from behind Mario to in front of Mario sCutsceneVars[1].angle[1] = (yaw - (sMarioCamState->faceAngle[1] + sCutsceneVars[3].angle[1])) & 0xFF00; @@ -9332,9 +9173,6 @@ void cutscene_cap_switch_press_start(struct Camera *c) { void cutscene_cap_switch_press_rotate_around_mario(struct Camera *c) { f32 dist; s16 pitch, yaw; - UNUSED s16 unusedYaw = sMarioCamState->faceAngle[1] + 0x1000; - UNUSED s16 unused; - UNUSED s32 cvar1Yaw = sCutsceneVars[1].angle[1]; vec3f_get_dist_and_angle(sMarioCamState->pos, c->pos, &dist, &pitch, &yaw); @@ -9625,8 +9463,6 @@ void cutscene_intro_peach_fly_to_pipe(struct Camera *c) { * Lakitu flies around the warp pipe, then Mario jumps out. */ void cutscene_intro_peach_mario_appears(struct Camera *c) { - UNUSED u32 pad[2]; - sMarioCamState->cameraEvent = 0; cutscene_event(cutscene_intro_peach_reset_spline, c, 0, 0); cutscene_event(cutscene_intro_peach_follow_pipe_spline, c, 0, -1); @@ -9936,9 +9772,8 @@ void cutscene_sliding_doors_fly_back_up(UNUSED struct Camera *c) { */ void cutscene_sliding_doors_follow_mario(struct Camera *c) { Vec3f pos; - UNUSED u32 pad[5]; - vec3f_copy(pos, c->pos); + // Update cvar1 with Mario's position (the y value doesn't change) sCutsceneVars[1].point[0] = sMarioCamState->pos[0]; sCutsceneVars[1].point[2] = sMarioCamState->pos[2]; @@ -9962,8 +9797,6 @@ void cutscene_sliding_doors_follow_mario(struct Camera *c) { * Note: the star door unlocking event is not a cutscene, it's handled by Mario separately. */ void cutscene_sliding_doors_open(struct Camera *c) { - UNUSED u32 pad[2]; - reset_pan_distance(c); cutscene_event(cutscene_sliding_doors_open_start, c, 0, 8); cutscene_event(cutscene_sliding_doors_open_set_cvars, c, 8, 8); @@ -10184,7 +10017,6 @@ void cutscene_enter_cannon_end(struct Camera *c) { */ void cutscene_enter_cannon_raise(struct Camera *c) { struct Object *o; - UNUSED u32 pad[2]; f32 floorHeight; struct Surface *floor; Vec3f cannonFocus; @@ -10332,8 +10164,6 @@ void cutscene_door_end(struct Camera *c) { * Used for entering a room that uses a specific camera mode, like the castle lobby or BBH */ void cutscene_door_mode(struct Camera *c) { - UNUSED u32 pad[2]; - reset_pan_distance(c); camera_course_processing(c); @@ -11141,13 +10971,9 @@ struct CutsceneSplinePoint sCcmOutsideCreditsSplineFocus[] = { * the duration they want the flag to be active. */ void play_cutscene(struct Camera *c) { - UNUSED u32 pad[3]; - UNUSED s16 unusedYawFocToMario; s16 cutsceneDuration; - u8 oldCutscene; + u8 oldCutscene = c->cutscene; - unusedYawFocToMario = sAreaYaw; - oldCutscene = c->cutscene; sStatusFlags &= ~CAM_FLAG_SMOOTH_MOVEMENT; gCameraMovementFlags &= ~CAM_MOVING_INTO_MODE; diff --git a/src/game/debug.c b/src/game/debug.c index d8d32dda..4b240b12 100644 --- a/src/game/debug.c +++ b/src/game/debug.c @@ -162,7 +162,6 @@ void print_debug_top_down_normal(const char *str, s32 number) { } } -#ifndef VERSION_EU void print_mapinfo(void) { struct Surface *pfloor; f32 bgY; @@ -180,10 +179,7 @@ void print_mapinfo(void) { print_debug_top_down_normal("mapinfo", 0); print_debug_top_down_mapinfo("area %x", area); print_debug_top_down_mapinfo("wx %d", gCurrentObject->oPosX); - //! Fat finger: programmer hit tab instead of space. Japanese - // thumb shift keyboards had the tab key next to the spacebar, - // so this was likely the reason. - print_debug_top_down_mapinfo("wy\t %d", gCurrentObject->oPosY); + print_debug_top_down_mapinfo("wy %d", gCurrentObject->oPosY); print_debug_top_down_mapinfo("wz %d", gCurrentObject->oPosZ); print_debug_top_down_mapinfo("bgY %d", bgY); print_debug_top_down_mapinfo("angY %d", angY); @@ -199,41 +195,6 @@ void print_mapinfo(void) { print_debug_top_down_mapinfo("water %d", water); } } -#else -void print_mapinfo(void) { - // EU mostly stubbed this function out. - struct Surface *pfloor; - UNUSED f32 bgY; - UNUSED f32 water; - UNUSED s32 area; - // s32 angY; - // - // angY = gCurrentObject->oMoveAngleYaw / 182.044000; - // area = ((s32)gCurrentObject->oPosX + 0x2000) / 1024 - // + ((s32)gCurrentObject->oPosZ + 0x2000) / 1024 * 16; - // - bgY = find_floor(gCurrentObject->oPosX, gCurrentObject->oPosY, gCurrentObject->oPosZ, &pfloor); - water = find_water_level(gCurrentObject->oPosX, gCurrentObject->oPosZ); - - print_debug_top_down_normal("mapinfo", 0); - // print_debug_top_down_mapinfo("area %x", area); - // print_debug_top_down_mapinfo("wx %d", gCurrentObject->oPosX); - // print_debug_top_down_mapinfo("wy\t %d", gCurrentObject->oPosY); - // print_debug_top_down_mapinfo("wz %d", gCurrentObject->oPosZ); - // print_debug_top_down_mapinfo("bgY %d", bgY); - // print_debug_top_down_mapinfo("angY %d", angY); - // - // if(pfloor) // not null - //{ - // print_debug_top_down_mapinfo("bgcode %d", pfloor->type); - // print_debug_top_down_mapinfo("bgstatus %d", pfloor->flags); - // print_debug_top_down_mapinfo("bgarea %d", pfloor->room); - //} - // - // if(gCurrentObject->oPosY < water) - // print_debug_top_down_mapinfo("water %d", water); -} -#endif void print_checkinfo(void) { print_debug_top_down_normal("checkinfo", 0); @@ -506,8 +467,6 @@ void try_print_debug_mario_level_info(void) { * [5][7] (b7 in the string array) to 1 to enable debug spawn. */ void try_do_mario_debug_object_spawn(void) { - UNUSED s32 unused; - if (sDebugPage == DEBUG_PAGE_STAGEINFO && gDebugInfo[DEBUG_PAGE_ENEMYINFO][7] == 1) { if (gPlayer1Controller->buttonPressed & R_JPAD) { spawn_object_relative(0, 0, 100, 200, gCurrentObject, MODEL_KOOPA_SHELL, bhvKoopaShell); diff --git a/src/game/game_init.c b/src/game/game_init.c index a5916bfa..f698f9af 100644 --- a/src/game/game_init.c +++ b/src/game/game_init.c @@ -75,7 +75,6 @@ struct DmaHandlerList gDemoInputsBuf; // fillers UNUSED static u8 sfillerGameInit[0x90]; -UNUSED static s32 sUnusedGameInitValue = 0; // General timer that runs as the game starts u32 gGlobalTimer = 0; @@ -481,8 +480,6 @@ UNUSED static void record_demo(void) { * Take the updated controller struct and calculate the new x, y, and distance floats. */ void adjust_analog_stick(struct Controller *controller) { - UNUSED u8 pad[8]; - // Reset the controller's x and y floats. controller->stickX = 0; controller->stickY = 0; diff --git a/src/game/hud.c b/src/game/hud.c index 5106d7dd..2d949127 100644 --- a/src/game/hud.c +++ b/src/game/hud.c @@ -72,12 +72,6 @@ struct PowerMeterHUD { f32 unused; }; -struct UnusedHUDStruct { - u32 unused1; - u16 unused2; - u16 unused3; -}; - struct CameraHUD { s16 status; }; @@ -98,8 +92,6 @@ static struct PowerMeterHUD sPowerMeterHUD = { // when the power meter is hidden. s32 sPowerMeterVisibleTimer = 0; -UNUSED static struct UnusedHUDStruct sUnusedHUDValues = { 0x00, 0x0A, 0x00 }; - static struct CameraHUD sCameraHUD = { CAM_STATUS_NONE }; /** diff --git a/src/game/ingame_menu.c b/src/game/ingame_menu.c index 0292ebf7..d8daa65e 100644 --- a/src/game/ingame_menu.c +++ b/src/game/ingame_menu.c @@ -656,7 +656,6 @@ void print_hud_my_score_stars(s8 fileNum, s8 courseNum, s16 x, s16 y) { u8 strStarCount[4]; s16 starCount; u8 textSymStar[] = { GLYPH_STAR, GLYPH_SPACE }; - UNUSED u16 unused; u8 textSymX[] = { GLYPH_MULTIPLY, GLYPH_SPACE }; starCount = save_file_get_course_star_count(fileNum, courseNum); @@ -753,8 +752,6 @@ void reset_dialog_render_state(void) { #define Y_VAL2 5.0f void render_dialog_box_type(struct DialogEntry *dialog, s8 linesPerBox) { - UNUSED s32 unused; - create_dl_translation_matrix(MENU_MTX_NOPUSH, dialog->leftOffset, dialog->width, 0); switch (gDialogBoxType) { @@ -890,10 +887,7 @@ u32 ensure_nonnegative(s16 value) { return value; } -void handle_dialog_text_and_pages(s8 colorMode, struct DialogEntry *dialog, s8 lowerBound) -{ - UNUSED s32 pad[2]; - +void handle_dialog_text_and_pages(s8 colorMode, struct DialogEntry *dialog, s8 lowerBound) { u8 strChar; s16 colorLoop; diff --git a/src/game/interaction.c b/src/game/interaction.c index eeddd68f..fc4ffde5 100644 --- a/src/game/interaction.c +++ b/src/game/interaction.c @@ -1242,8 +1242,6 @@ u32 interact_clam_or_bubba(struct MarioState *m, UNUSED u32 interactType, struct } u32 interact_bully(struct MarioState *m, UNUSED u32 interactType, struct Object *o) { - UNUSED u32 unused; - u32 interaction; if (m->flags & MARIO_METAL_CAP) { interaction = INT_FAST_ATTACK_OR_SHELL; @@ -1337,8 +1335,6 @@ u32 interact_mr_blizzard(struct MarioState *m, UNUSED u32 interactType, struct O } u32 interact_hit_from_below(struct MarioState *m, UNUSED u32 interactType, struct Object *o) { - UNUSED u32 unused; - u32 interaction; if (m->flags & MARIO_METAL_CAP) { interaction = INT_FAST_ATTACK_OR_SHELL; @@ -1775,8 +1771,8 @@ void check_kick_or_punch_wall(struct MarioState *m) { detector.x = m->pos[0] + 50.0f * sins(m->faceAngle[1]); detector.z = m->pos[2] + 50.0f * coss(m->faceAngle[1]); detector.y = m->pos[1]; - detector.offsetY = 80.0f; - detector.radius = 5.0f; + detector.offsetY = 80.0f; + detector.radius = 5.0f; if (find_wall_collisions(&detector) > 0) { if (m->action != ACT_MOVE_PUNCHING || m->forwardVel >= 0.0f) { diff --git a/src/game/level_update.c b/src/game/level_update.c index d449c5b8..5f36f66c 100644 --- a/src/game/level_update.c +++ b/src/game/level_update.c @@ -177,17 +177,11 @@ s16 sDelayedWarpOp; s16 sDelayedWarpTimer; s16 sSourceWarpNodeId; s32 sDelayedWarpArg; -#if defined(VERSION_EU) || defined(VERSION_SH) -s16 unusedEULevelUpdateBss1; -#endif s8 sTimerRunning; s8 gNeverEnteredCastle; struct MarioState *gMarioState = &gMarioStates[0]; -u8 unused1[4] = { 0 }; s8 sWarpCheckpointActive = FALSE; -u8 unused3[4]; -u8 unused4[2]; u16 level_control_timer(s32 timerOp) { switch (timerOp) { diff --git a/src/game/level_update.h b/src/game/level_update.h index 1d31bb2a..cbc8199b 100644 --- a/src/game/level_update.h +++ b/src/game/level_update.h @@ -68,7 +68,6 @@ extern struct MarioState *gMarioState; extern s16 sCurrPlayMode; extern s16 sTransitionTimer; extern void (*sTransitionUpdate)(s16 *); -extern u8 unused3[4]; extern void load_language_text(void); struct WarpDest { @@ -86,7 +85,6 @@ extern s16 sDelayedWarpOp; extern s16 sDelayedWarpTimer; extern s16 sSourceWarpNodeId; extern s32 sDelayedWarpArg; -extern u8 unused4[2]; extern s8 sTimerRunning; struct HudDisplay { diff --git a/src/game/macro_special_objects.c b/src/game/macro_special_objects.c index cb85214b..08b62274 100644 --- a/src/game/macro_special_objects.c +++ b/src/game/macro_special_objects.c @@ -171,8 +171,6 @@ void spawn_macro_objects(s32 areaIndex, s16 *macroObjList) { } void spawn_macro_objects_hardcoded(s32 areaIndex, s16 *macroObjList) { - UNUSED u8 pad[8]; - // This version of macroObjList has the preset and Y-Rotation separated, // and lacks behavior params. Might be an early version of the macro object list? s16 macroObjX; @@ -181,8 +179,6 @@ void spawn_macro_objects_hardcoded(s32 areaIndex, s16 *macroObjList) { s16 macroObjPreset; s16 macroObjRY; // Y Rotation - UNUSED u8 pad2[10]; - gMacroObjectDefaultParent.header.gfx.areaIndex = areaIndex; gMacroObjectDefaultParent.header.gfx.activeAreaIndex = areaIndex; diff --git a/src/game/mario_actions_airborne.c b/src/game/mario_actions_airborne.c index 12dd2c1e..473ccc43 100644 --- a/src/game/mario_actions_airborne.c +++ b/src/game/mario_actions_airborne.c @@ -340,8 +340,6 @@ void update_flying_pitch(struct MarioState *m) { } void update_flying(struct MarioState *m) { - UNUSED u32 unused; - update_flying_pitch(m); update_flying_yaw(m); diff --git a/src/game/mario_actions_automatic.c b/src/game/mario_actions_automatic.c index d049e8b0..6c5748e6 100644 --- a/src/game/mario_actions_automatic.c +++ b/src/game/mario_actions_automatic.c @@ -58,9 +58,6 @@ void play_climbing_sounds(struct MarioState *m, s32 b) { } s32 set_pole_position(struct MarioState *m, f32 offsetY) { - UNUSED s32 unused1; - UNUSED s32 unused2; - UNUSED s32 unused3; struct Surface *floor; struct Surface *ceil; f32 floorHeight; @@ -301,16 +298,15 @@ s32 act_top_of_pole(struct MarioState *m) { } s32 perform_hanging_step(struct MarioState *m, Vec3f nextPos) { - UNUSED s32 unused; struct Surface *ceil; struct Surface *floor; f32 ceilHeight; f32 floorHeight; f32 ceilOffset; - struct WallCollisionData wallCollisionData; + struct WallCollisionData wallCollisionData; - resolve_and_return_wall_collisions(nextPos, 50.0f, 50.0f, &wallCollisionData); - m->wall = wallCollisionData.numWalls == 0 ? NULL : wallCollisionData.walls[0]; + resolve_and_return_wall_collisions(nextPos, 50.0f, 50.0f, &wallCollisionData); + m->wall = wallCollisionData.numWalls == 0 ? NULL : wallCollisionData.walls[0]; floorHeight = find_floor(nextPos[0], nextPos[1], nextPos[2], &floor); ceilHeight = find_ceil(nextPos[0], nextPos[1] + 3.0f, nextPos[2], &ceil); diff --git a/src/game/mario_actions_cutscene.c b/src/game/mario_actions_cutscene.c index dc857fed..24845944 100644 --- a/src/game/mario_actions_cutscene.c +++ b/src/game/mario_actions_cutscene.c @@ -34,7 +34,6 @@ static struct Object *sEndPeachObj; static struct Object *sEndRightToadObj; static struct Object *sEndLeftToadObj; static struct Object *sEndJumboStarObj; -static UNUSED s32 sUnused; static s16 sEndPeachAnimation; static s16 sEndToadAnims[2]; diff --git a/src/game/mario_actions_moving.c b/src/game/mario_actions_moving.c index b4cac3da..687100f9 100644 --- a/src/game/mario_actions_moving.c +++ b/src/game/mario_actions_moving.c @@ -511,8 +511,6 @@ s32 should_begin_sliding(struct MarioState *m) { } s32 check_ground_dive_or_punch(struct MarioState *m) { - UNUSED s32 unused; - if (m->input & INPUT_B_PRESSED) { //! Speed kick (shoutouts to SimpleFlips) if (m->forwardVel >= 29.0f && m->controller->stickMag > 48.0f) { diff --git a/src/game/mario_actions_submerged.c b/src/game/mario_actions_submerged.c index fd9cdea3..1211de91 100644 --- a/src/game/mario_actions_submerged.c +++ b/src/game/mario_actions_submerged.c @@ -76,7 +76,7 @@ static u32 perform_water_full_step(struct MarioState *m, Vec3f nextPos) { f32 floorHeight; resolve_and_return_wall_collisions(nextPos, 10.0f, 110.0f, &wallData); - wall = wallData.numWalls == 0 ? NULL : wallData.walls[0]; + wall = wallData.numWalls == 0 ? NULL : wallData.walls[0]; floorHeight = find_floor(nextPos[0], nextPos[1], nextPos[2], &floor); ceilHeight = find_ceil(nextPos[0], nextPos[1] + 3.0f, nextPos[2], &ceil); @@ -167,7 +167,6 @@ static void apply_water_current(struct MarioState *m, Vec3f step) { } static u32 perform_water_step(struct MarioState *m) { - UNUSED u32 unused; u32 stepResult; Vec3f nextPos; Vec3f step; diff --git a/src/game/mario_misc.c b/src/game/mario_misc.c index d394c5b1..6e268766 100644 --- a/src/game/mario_misc.c +++ b/src/game/mario_misc.c @@ -243,9 +243,7 @@ void bhv_unlock_door_star_init(void) { } void bhv_unlock_door_star_loop(void) { - UNUSED u8 unused1[4]; s16 prevYaw = gCurrentObject->oMoveAngleYaw; - UNUSED u8 unused2[4]; // Speed up the star every frame if (gCurrentObject->oUnlockDoorStarYawVel < 0x2400) { diff --git a/src/game/moving_texture.c b/src/game/moving_texture.c index 744e8e63..7e99d473 100644 --- a/src/game/moving_texture.c +++ b/src/game/moving_texture.c @@ -303,7 +303,6 @@ struct MovtexObject gMovtexColored2[] = { */ Gfx *geo_wdw_set_initial_water_level(s32 callContext, UNUSED struct GraphNode *node, UNUSED Mat4 mtx) { s32 i; - UNUSED u8 unused[] = { 1, 0, 4, 0, 7, 0, 10, 0 }; s16 wdwWaterHeight; // Why was this global variable needed when they could just check for GEO_CONTEXT_AREA_LOAD? diff --git a/src/game/nupiinitsram.c b/src/game/nupiinitsram.c index 4e1ad1bf..5ec41709 100644 --- a/src/game/nupiinitsram.c +++ b/src/game/nupiinitsram.c @@ -31,23 +31,23 @@ int nuPiInitSram() { if (SramHandle.baseAddress == PHYS_TO_K1(SRAM_START_ADDR)) return 0; - + /* Fill basic information */ SramHandle.type = DEVICE_TYPE_SRAM; SramHandle.baseAddress = PHYS_TO_K1(SRAM_START_ADDR); - + /* Get Domain parameters */ SramHandle.latency = (u8)SRAM_LATENCY; SramHandle.pulse = (u8)SRAM_PULSE; SramHandle.pageSize = (u8)SRAM_PAGE_SIZE; SramHandle.relDuration = (u8)SRAM_REL_DURATION; SramHandle.domain = PI_DOMAIN2; - + /* Fill speed and transferInfo to zero */ SramHandle.speed = 0; bzero((void *)&(SramHandle.transferInfo), sizeof(SramHandle.transferInfo)); - + /* Put the SramHandle onto PiTable*/ osEPiLinkHandle(&SramHandle); nuPiSramHandle = &SramHandle; diff --git a/src/game/nupireadwritesram.c b/src/game/nupireadwritesram.c index 9f0a3a90..dda54ab5 100644 --- a/src/game/nupireadwritesram.c +++ b/src/game/nupireadwritesram.c @@ -22,7 +22,7 @@ extern OSPiHandle* nuPiSramHandle; /* RET: None */ /*----------------------------------------------------------------------*/ int nuPiReadWriteSram(u32 addr, void* buf_ptr, u32 size, s32 flag) -{ +{ OSIoMesg dmaIoMesgBuf; OSMesgQueue dmaMesgQ; OSMesg dmaMesgBuf; diff --git a/src/game/obj_behaviors_2.c b/src/game/obj_behaviors_2.c index 747de21b..c6294082 100644 --- a/src/game/obj_behaviors_2.c +++ b/src/game/obj_behaviors_2.c @@ -153,7 +153,6 @@ static void platform_on_track_update_pos_or_spawn_ball(s32 ballIndex, f32 x, f32 struct Waypoint *initialPrevWaypoint; struct Waypoint *nextWaypoint; struct Waypoint *prevWaypoint; - UNUSED s32 unused; f32 amountToMove; f32 dx; f32 dy; diff --git a/src/game/object_helpers.c b/src/game/object_helpers.c index bea4b015..6c4268d4 100644 --- a/src/game/object_helpers.c +++ b/src/game/object_helpers.c @@ -368,7 +368,6 @@ s16 obj_angle_to_object(struct Object *obj1, struct Object *obj2) { s16 obj_turn_toward_object(struct Object *obj, struct Object *target, s16 angleIndex, s16 turnAmount) { f32 a, b, c, d; - UNUSED s32 unused; s16 targetAngle = 0; s16 startAngle; @@ -1186,9 +1185,6 @@ static s32 cur_obj_move_xz(f32 steepSlopeNormalY, s32 careAboutEdgesAndSteepSlop f32 intendedFloorHeight = find_floor(intendedX, o->oPosY, intendedZ, &intendedFloor); f32 deltaFloorHeight = intendedFloorHeight - o->oFloorHeight; - UNUSED f32 unused; - UNUSED f32 ny; - o->oMoveFlags &= ~OBJ_MOVE_HIT_EDGE; if (o->oRoom != -1 && intendedFloor != NULL) { @@ -1222,7 +1218,7 @@ static s32 cur_obj_move_xz(f32 steepSlopeNormalY, s32 careAboutEdgesAndSteepSlop o->oMoveFlags |= OBJ_MOVE_HIT_EDGE; return FALSE; } - } else if ((ny = intendedFloor->normal.y) > steepSlopeNormalY || o->oPosY > intendedFloorHeight) { + } else if (intendedFloor->normal.y > steepSlopeNormalY || o->oPosY > intendedFloorHeight) { // Allow movement upward, provided either: // - The target floor is flat enough (e.g. walking up stairs) // - We are above the target floor (most likely in the air) diff --git a/src/game/object_list_processor.c b/src/game/object_list_processor.c index 12948fb0..1cd4e268 100644 --- a/src/game/object_list_processor.c +++ b/src/game/object_list_processor.c @@ -34,8 +34,6 @@ s32 gDebugInfoFlags; */ s32 gNumFindFloorMisses; -UNUSED s32 unused_8033BEF8; - /** * An unused debug counter with the label "WALL". */ @@ -475,9 +473,7 @@ void spawn_objects_from_info(UNUSED s32 unused, struct SpawnInfo *spawnInfo) { while (spawnInfo != NULL) { struct Object *object; - UNUSED s32 unused; const BehaviorScript *script; - UNUSED s16 arg16 = (s16)(spawnInfo->behaviorArg & 0xFFFF); script = segmented_to_virtual(spawnInfo->behaviorScript); @@ -588,7 +584,6 @@ void update_non_terrain_objects(void) { * Unload deactivated objects in any object list. */ void unload_deactivated_objects(void) { - UNUSED s32 unused; s32 listIndex; s32 i = 0; diff --git a/src/game/object_list_processor.h b/src/game/object_list_processor.h index 38c02aa3..1f2be9cd 100644 --- a/src/game/object_list_processor.h +++ b/src/game/object_list_processor.h @@ -63,7 +63,6 @@ extern struct ObjectNode gObjectListArray[]; extern s32 gDebugInfoFlags; extern s32 gNumFindFloorMisses; -extern UNUSED s32 unused_8033BEF8; extern s32 gUnknownWallCount; extern u32 gObjectCounter; diff --git a/src/game/paintings.c b/src/game/paintings.c index 5b7e39c8..f0bdcdc0 100644 --- a/src/game/paintings.c +++ b/src/game/paintings.c @@ -770,7 +770,6 @@ s8 normalize_component(f32 comp) { * The table used in game, seg2_painting_mesh_neighbor_tris, is in bin/segment2.c. */ void painting_average_vertex_normals(s16 *neighborTris, s16 numVtx) { - UNUSED s16 unused; s16 tri; s16 i; s16 j; diff --git a/src/game/platform_displacement.c b/src/game/platform_displacement.c index 63e39354..715ad614 100644 --- a/src/game/platform_displacement.c +++ b/src/game/platform_displacement.c @@ -21,7 +21,6 @@ struct Object *gMarioPlatform = NULL; */ void update_mario_platform(void) { struct Surface *floor; - UNUSED u32 unused; f32 marioX; f32 marioY; f32 marioZ; @@ -242,9 +241,6 @@ void apply_platform_displacement(u32 isMario, struct Object *platform) { Vec3f relativeOffset; Vec3f newObjectOffset; Vec3s rotation; - UNUSED s16 unused1; - UNUSED s16 unused2; - UNUSED s16 unused3; f32 displaceMatrix[4][4]; rotation[0] = platform->oAngleVelPitch; diff --git a/src/game/print.c b/src/game/print.c index e1f9ec26..dcad8d40 100644 --- a/src/game/print.c +++ b/src/game/print.c @@ -254,8 +254,6 @@ void print_text(s32 x, s32 y, const char *str) { */ void print_text_centered(s32 x, s32 y, const char *str) { char c = 0; - UNUSED s8 unused1 = 0; - UNUSED s32 unused2 = 0; s32 length = 0; s32 srcIndex = 0; diff --git a/src/game/rendering_graph_node.c b/src/game/rendering_graph_node.c index 42f6087b..d4c3b61c 100644 --- a/src/game/rendering_graph_node.c +++ b/src/game/rendering_graph_node.c @@ -1316,7 +1316,6 @@ void geo_process_node_and_siblings(struct GraphNode *firstNode) { * to set up the projection and draw display lists. */ void geo_process_root(struct GraphNodeRoot *node, Vp *b, Vp *c, s32 clearColor) { - UNUSED s32 unused; #if PUPPYPRINT_DEBUG OSTime first = osGetTime(); #endif diff --git a/src/game/sram.h b/src/game/sram.h index 7855e067..98f13ac6 100644 --- a/src/game/sram.h +++ b/src/game/sram.h @@ -20,11 +20,11 @@ extern int nuPiReadWriteSram(u32 addr, void* buf_ptr, u32 size, s32 flag); /*----------------------------------------------------------------------*/ #define nuPiReadSram(addr, buf_ptr, size) \ nuPiReadWriteSram(addr, buf_ptr, size, OS_READ) - + /*----------------------------------------------------------------------*/ /* nuPiWriteSram - Write to SRAM */ /*----------------------------------------------------------------------*/ #define nuPiWriteSram(addr, buf_ptr, size) \ - nuPiReadWriteSram(addr, buf_ptr, size, OS_WRITE) + nuPiReadWriteSram(addr, buf_ptr, size, OS_WRITE) #endif // SRAM_H \ No newline at end of file diff --git a/src/game/vc_check.h b/src/game/vc_check.h index c39ac722..71d29e23 100644 --- a/src/game/vc_check.h +++ b/src/game/vc_check.h @@ -12,7 +12,7 @@ f32 round_double_to_float(f64); * This check forces RTZ bug on vc * If console is N64/adequate Emu round-to-nearest (RTN) rounding mode is used * If console is VC round-to-zero (RTZ) mode is used - * + * * The double value 0.9999999999999999 used is 0x3FEFFFFFFFFFFFFF in binary * Exponent=01111111110, Mantissa=1111111111111111111111111111111111111111111111111111 * RTZ will output not 1.0f, RTN will output exactly 1.0f diff --git a/src/goddard/debug_utils.c b/src/goddard/debug_utils.c index ff714059..c18b6f12 100644 --- a/src/goddard/debug_utils.c +++ b/src/goddard/debug_utils.c @@ -439,7 +439,6 @@ void print_stack_trace(void) { */ void fatal_printf(const char *fmt, ...) { char cur; - UNUSED u8 pad[4]; va_list vl; va_start(vl, fmt); @@ -669,7 +668,6 @@ char *sprint_val_withspecifiers(char *str, union PrintVal val, char *specifiers) s32 intPart; // sp38 s32 intPrec; // sp34 s32 fracPrec; // sp30 - UNUSED u8 pad[4]; char cur; // sp2B fracPrec = 6; diff --git a/src/goddard/draw_objects.c b/src/goddard/draw_objects.c index d6fe652b..0e5bdff1 100644 --- a/src/goddard/draw_objects.c +++ b/src/goddard/draw_objects.c @@ -168,7 +168,6 @@ void draw_shape(struct ObjShape *shape, s32 flag, f32 c, f32 d, f32 e, // "sweep f32 i, f32 j, f32 k, // translate shape f32 l, f32 m, f32 n, // rotate x, y, z s32 colorIdx, Mat4f *rotMtx) { - UNUSED u8 unused[8]; struct GdVec3f sp1C; restart_timer("drawshape"); @@ -245,7 +244,6 @@ void draw_shape(struct ObjShape *shape, s32 flag, f32 c, f32 d, f32 e, // "sweep void draw_shape_2d(struct ObjShape *shape, s32 flag, UNUSED f32 c, UNUSED f32 d, UNUSED f32 e, f32 f, f32 g, f32 h, UNUSED f32 i, UNUSED f32 j, UNUSED f32 k, UNUSED f32 l, UNUSED f32 m, UNUSED f32 n, UNUSED s32 color, UNUSED s32 p) { - UNUSED u8 unused[8]; struct GdVec3f sp1C; restart_timer("drawshape2d"); @@ -437,7 +435,6 @@ void draw_face(struct ObjFace *face) { f32 z; // 38 f32 y; // 34 f32 x; // 30 - UNUSED u8 pad[12]; s32 i; // 20; also used to store mtl's gddl number s32 hasTextCoords; // 1c Vtx *gbiVtx; // 18 @@ -536,7 +533,6 @@ void Unknown801792F0(struct GdObj *obj) { void draw_label(struct ObjLabel *label) { struct GdVec3f position; char strbuf[0x100]; - UNUSED u8 unused[16]; struct ObjValPtr *valptr; union ObjVarVal varval; valptrproc_t valfn = label->valfn; @@ -593,7 +589,6 @@ void draw_label(struct ObjLabel *label) { void draw_net(struct ObjNet *self) { struct ObjNet *net = self; s32 netColor; - UNUSED u8 unused[80]; if (sSceneProcessType == FIND_PICKS) { return; @@ -729,7 +724,6 @@ void world_pos_to_screen_coords(struct GdVec3f *pos, struct ObjCamera *cam, stru */ void check_grabable_click(struct GdObj *input) { struct GdVec3f objPos; - UNUSED u8 unused[12]; struct GdObj *obj; Mat4f *mtx; @@ -772,8 +766,6 @@ void check_grabable_click(struct GdObj *input) { * @param lightgrp lights of `ObjView */ void drawscene(enum SceneType process, struct ObjGroup *interactables, struct ObjGroup *lightgrp) { - UNUSED u8 unused[16]; - restart_timer("drawscene"); imin("draw_scene()"); sUnreadShapeFlag = 0; @@ -868,11 +860,9 @@ void draw_shape_faces(struct ObjShape *shape) { */ void draw_particle(struct GdObj *obj) { struct ObjParticle *ptc = (struct ObjParticle *) obj; - UNUSED u8 unused1[16]; struct GdColour *white; struct GdColour *black; f32 brightness; - UNUSED u8 unused2[16]; if (ptc->timeout > 0) { white = sColourPalette[0]; @@ -906,32 +896,8 @@ void draw_particle(struct GdObj *obj) { * @note This function returns before doing any work. It seems * that Goddard moved away from using bones in the final code */ -void draw_bone(struct GdObj *obj) { - struct ObjBone *bone = (struct ObjBone *) obj; - UNUSED u8 unused1[4]; - s32 colour; - UNUSED u8 unused2[4]; - struct GdVec3f scale; // guess - +void draw_bone(UNUSED struct GdObj *obj) { return; - - // dead code - scale.x = 1.0f; - scale.y = 1.0f; - scale.z = bone->unkF8 / 50.0f; - - if (bone->header.drawFlags & OBJ_HIGHLIGHTED) { - colour = COLOUR_YELLOW; - } else { - colour = bone->colourNum; - } - bone->header.drawFlags &= ~OBJ_HIGHLIGHTED; - - if (sSceneProcessType != FIND_PICKS) { - draw_shape(bone->shapePtr, 0x1B, scale.x, scale.y, scale.z, bone->worldPos.x, bone->worldPos.y, - bone->worldPos.z, 0.0f, 0.0f, 0.0f, bone->unk28.x, bone->unk28.y, bone->unk28.z, colour, - &bone->mat70); - } } /** @@ -939,14 +905,10 @@ void draw_bone(struct GdObj *obj) { */ void draw_joint(struct GdObj *obj) { struct ObjJoint *joint = (struct ObjJoint *) obj; - UNUSED u8 unused1[4]; UNUSED f32 sp7C = 70.0f; - UNUSED u8 unused2[4]; UNUSED s32 sp74 = 1; s32 colour; - UNUSED u8 unused[8]; struct ObjShape *boneShape; - UNUSED u8 unused3[28]; if ((boneShape = joint->shapePtr) == NULL) { return; @@ -1260,7 +1222,7 @@ static void find_thisface_verts(struct ObjFace *face, struct ObjGroup *vertexGrp struct ListNode *node; for (i = 0; i < face->vtxCount; i++) { - // find the vertex or particle whose index in vertexGrp equals face->vertices[i] + // find the vertex or particle whose index in vertexGrp equals face->vertices[i] node = vertexGrp->firstMember; currIndex = 0; while (node != NULL) { @@ -1347,7 +1309,6 @@ void unpick_obj(struct GdObj *obj) { */ void find_closest_pickable_obj(struct GdObj *input) { struct GdObj *obj = input; - UNUSED u8 unused[12]; f32 distance; if (obj->drawFlags & OBJ_IS_GRABBALE) { diff --git a/src/goddard/dynlist_proc.c b/src/goddard/dynlist_proc.c index 60f3b790..f036dae4 100644 --- a/src/goddard/dynlist_proc.c +++ b/src/goddard/dynlist_proc.c @@ -158,8 +158,6 @@ void reset_dynlist(void) { * Normally the dynlist specifically sets an object for return. */ struct GdObj *proc_dynlist(struct DynList *dylist) { - UNUSED u32 pad[2]; - if (dylist++->cmd != 0xD1D4) { fatal_printf("proc_dynlist() not a valid dyn list"); } @@ -1224,7 +1222,7 @@ void d_map_materials(DynObjName name) { /** * For all faces in the current `ObjGroup`, resolve their vertex indices to - * `ObjVertex` pointers that point to vertices in the specified vertex group. + * `ObjVertex` pointers that point to vertices in the specified vertex group. * Also compute normals for all faces in the current `ObjGroup` and all vertices * in the specified vertex group. * See `map_vertices()` for more info. @@ -2631,7 +2629,7 @@ void d_set_parm_ptr(enum DParmPtr param, void *ptr) { fatal_printf("dsetparmp() too many points"); } // `ptr` here is a vertex index, not an actual pointer. - // These vertex indices later get converted to `ObjVertex` pointers when `find_thisface_verts` is called. + // These vertex indices later get converted to `ObjVertex` pointers when `find_thisface_verts` is called. ((struct ObjFace *) sDynListCurObj)->vertices[((struct ObjFace *) sDynListCurObj)->vtxCount++] = ptr; break; default: diff --git a/src/goddard/dynlists/dynlist_macros.h b/src/goddard/dynlists/dynlist_macros.h index decb8fa9..cbde7263 100644 --- a/src/goddard/dynlists/dynlist_macros.h +++ b/src/goddard/dynlists/dynlist_macros.h @@ -24,7 +24,7 @@ /** * Set the initial position of the current object - * Supported Objs: joints, particles, nets, vertices, cameras + * Supported Objs: joints, particles, nets, vertices, cameras */ #define SetInitialPosition(x, y, z) \ { 1, {0}, {0}, {(x), (y), (z)} } @@ -150,7 +150,7 @@ { 19, {0}, {(void *)(type)}, {0.0, 0.0, 0.0} } /** - * Set the current shape's material group to the specified group. + * Set the current shape's material group to the specified group. * Supported Objs: shapes */ #define SetMaterialGroup(mtlGrpName) \ diff --git a/src/goddard/dynlists/dynlist_mario_face.c b/src/goddard/dynlists/dynlist_mario_face.c index e742dd54..b504f785 100644 --- a/src/goddard/dynlists/dynlist_mario_face.c +++ b/src/goddard/dynlists/dynlist_mario_face.c @@ -354,7 +354,7 @@ struct DynList dynlist_mario_face_shape[] = { MakeDynObj(D_DATA_GRP, DYNOBJ_MARIO_FACE_TRI_GROUP), LinkWithPtr(&mario_Face_FaceInfo), - StartGroup(DYNOBJ_MARIO_FACE_MTL_GROUP), + StartGroup(DYNOBJ_MARIO_FACE_MTL_GROUP), // Teeth color MakeDynObj(D_MATERIAL, 0), SetId(0), @@ -366,7 +366,7 @@ struct DynList dynlist_mario_face_shape[] = { SetAmbient(0.883, 0.602, 0.408), SetDiffuse(0.883, 0.602, 0.408), // Shadow on back of hat - MakeDynObj(D_MATERIAL, 0), + MakeDynObj(D_MATERIAL, 0), SetId(2), SetAmbient(0.362, 0.0, 0.0), SetDiffuse(0.362, 0.0, 0.0), diff --git a/src/goddard/dynlists/dynlist_mario_master.c b/src/goddard/dynlists/dynlist_mario_master.c index 6a5b19ca..e359280b 100644 --- a/src/goddard/dynlists/dynlist_mario_master.c +++ b/src/goddard/dynlists/dynlist_mario_master.c @@ -1089,7 +1089,7 @@ struct DynList dynlist_mario_master[] = { AttachTo(0x0, DYNOBJ_MARIO_MAIN_ANIMATOR), SetNodeGroup(DYNOBJ_RIGHT_EYELID_ANIMDATA_GROUP), LinkWith(DYNOBJ_RIGHT_EYELID_JOINT_1), - + // whole head animator? MakeDynObj(D_DATA_GRP, DYNOBJ_MARIO_HEAD_ANIMDATA_GROUP), LinkWithPtr(&anim_mario_intro), diff --git a/src/goddard/gd_macros.h b/src/goddard/gd_macros.h index a895b025..299f2b61 100644 --- a/src/goddard/gd_macros.h +++ b/src/goddard/gd_macros.h @@ -3,7 +3,7 @@ /** * @file gd_macros.h - * + * * Common macros that Goddard used throughout the Mario Head subsytem code. */ diff --git a/src/goddard/gd_math.c b/src/goddard/gd_math.c index bc155f6c..4a31face 100644 --- a/src/goddard/gd_math.c +++ b/src/goddard/gd_math.c @@ -515,7 +515,7 @@ f32 gd_mat4f_det(Mat4f *mtx) { * returns the determinant. */ f32 gd_3x3_det(f32 r0c0, f32 r0c1, f32 r0c2, - f32 r1c0, f32 r1c1, f32 r1c2, + f32 r1c0, f32 r1c1, f32 r1c2, f32 r2c0, f32 r2c1, f32 r2c2) { f32 det; @@ -602,7 +602,6 @@ void UNUSED gd_quat_rotation(f32 quat[4], UNUSED s32 unused, f32 c, f32 s, s32 i s32 j; s32 k; f32 quatVal; - UNUSED u32 pad[2]; if ((j = i + 1) >= 4) { j = 1; @@ -655,16 +654,14 @@ void gd_shift_mat_up(Mat4f *mtx) { * | 0 w^2+i^2-j^2-k^2 2ij+2wk 2ik+2wj | * | 0 2ij-2wk w^2+j^2-i^2-k^2 2jk+2wi | * | 0 2ik+2wj 2jk-2wi w^2+k^2-i^2-j^2 | - * + * * Potentially broken if 'mtx' is not an identity matrix/zero'ed. */ void UNUSED gd_create_quat_rot_mat(f32 quat[4], UNUSED s32 unused, Mat4f *mtx) { f32 twoIJ; f32 two0K; f32 sqQuat[4]; - s32 i; - s32 j; - s32 k; + s32 i, j, k; for (i = 0; i < 4; i++) { sqQuat[i] = SQ(quat[i]); @@ -699,10 +696,10 @@ void UNUSED gd_create_quat_rot_mat(f32 quat[4], UNUSED s32 unused, Mat4f *mtx) { * Creates a rotation matrix to multiply the primary matrix by. * s/c are sin(angle)/cos(angle). That angular rotation is about vector * 'vec'. - * + * * Matrix has form- * - * | (1-c)z^2+c (1-c)zy-sx (1-c)xz-sy 0 | + * | (1-c)z^2+c (1-c)zy-sx (1-c)xz-sy 0 | * | (1-c)zy-sx (1-c)y^2+c (1-c)xy-sz 0 | * | (1-c)xz-sy (1-c)xy-sz (1-c)x^2+c 0 | * | 0 0 0 1 | @@ -876,8 +873,6 @@ void gd_mult_mat4f(const Mat4f *mA, const Mat4f *mB, Mat4f *dst) { * Printed the prefix at some point, as shown by how the function is used. */ void gd_print_vec(UNUSED const char *prefix, const struct GdVec3f *vec) { - UNUSED u8 pad[8]; - printf("%f,%f,%f\n", vec->x, vec->y, vec->z); printf("\n"); } @@ -888,8 +883,6 @@ void gd_print_vec(UNUSED const char *prefix, const struct GdVec3f *vec) { * Printed a prefix at some point, as shone by how the function is used. */ void gd_print_bounding_box(UNUSED const char *prefix, UNUSED const struct GdBoundingBox *p) { - UNUSED u8 pad[8]; - printf("Min X = %f, Max X = %f \n", p->minX, p->maxX); printf("Min Y = %f, Max Y = %f \n", p->minY, p->maxY); printf("Min Z = %f, Max Z = %f \n", p->minZ, p->maxZ); diff --git a/src/goddard/gd_math.h b/src/goddard/gd_math.h index 53c35397..1028dc83 100644 --- a/src/goddard/gd_math.h +++ b/src/goddard/gd_math.h @@ -24,7 +24,7 @@ enum GdRotAxis { void gd_adjunct_mat4f(Mat4f *src, Mat4f *dst); f32 gd_mat4f_det(Mat4f *mtx); f32 gd_3x3_det(f32 r0c0, f32 r0c1, f32 r0c2, - f32 r1c0, f32 r1c1, f32 r1c2, + f32 r1c0, f32 r1c1, f32 r1c2, f32 r2c0, f32 r2c1, f32 r2c2); f32 gd_2x2_det(f32 a, f32 b, f32 c, f32 d); diff --git a/src/goddard/gd_types.h b/src/goddard/gd_types.h index 7603796d..06a9ed4c 100644 --- a/src/goddard/gd_types.h +++ b/src/goddard/gd_types.h @@ -473,7 +473,7 @@ struct ObjGadget { /* 0x38 */ f32 rangeMin; /* 0x3C */ f32 rangeMax; /* 0x40 */ struct GdVec3f size; // size (x = width, y = height) - /* 0x4C */ struct ObjGroup *valueGrp; // group containing `ObjValPtr`s controlled by this gadget + /* 0x4C */ struct ObjGroup *valueGrp; // group containing `ObjValPtr`s controlled by this gadget /* 0x50 */ struct ObjShape *shapePtr; /* 0x54 */ struct ObjGroup *unk54; //node group? /* 0x58 */ u8 pad58[4]; @@ -605,7 +605,7 @@ struct ObjValPtr { /* 0x14 */ struct GdObj *obj; // maybe just a void *? /* 0x18 */ uintptr_t offset; // value pointed to is `obj` + `offset` /* 0x1C */ enum ValPtrType datatype; - /* 0x20 */ s32 flag; // TODO: better name for this? If 0x40000, then `offset` is an offset to a field in `obj`. Otherwise, `obj` is NULL, and `offset` is the address of a variable. + /* 0x20 */ s32 flag; // TODO: better name for this? If 0x40000, then `offset` is an offset to a field in `obj`. Otherwise, `obj` is NULL, and `offset` is the address of a variable. }; /* sizeof = 0x24 */ enum GdLightFlags { diff --git a/src/goddard/joints.c b/src/goddard/joints.c index 7fd60c5c..818ab47f 100644 --- a/src/goddard/joints.c +++ b/src/goddard/joints.c @@ -331,7 +331,6 @@ void func_8018F4CC(struct ObjJoint *j) { void func_8018F520(struct ObjBone *b) { struct ObjJoint *joint1; struct ObjJoint *joint2; - UNUSED u32 pad[3]; struct GdVec3f sp90; struct GdVec3f sp84; struct GdVec3f sp78; @@ -956,7 +955,6 @@ void func_80191220(struct ObjJoint *j) { /* 23FB90 -> 23FBC0 */ void func_801913C0(struct ObjJoint *j) { - UNUSED u32 pad[4]; func_80181894(j); } diff --git a/src/goddard/particles.c b/src/goddard/particles.c index adee570b..5ff5cfa2 100644 --- a/src/goddard/particles.c +++ b/src/goddard/particles.c @@ -27,7 +27,6 @@ struct Connection { }; // data -UNUSED static void *sUnused801A81D0 = NULL; static s32 D_801A81D4[25] = { /* ID? X Y Z */ 9, 3, 12, -14, 25, 5, 16, -25, 42, 4, 15, -39, 55, @@ -105,7 +104,6 @@ void Unknown80181D14(struct ObjFace *face) { /* 230680 -> 230858 */ void func_80181EB0(struct Connection *cxn) { struct GdVec3f sp34; - UNUSED u8 unused[0x2C]; struct ObjParticle *sp4 = cxn->node1.ptc; struct ObjParticle *sp0 = cxn->node2.ptc; @@ -134,7 +132,6 @@ void func_80181EB0(struct Connection *cxn) { /* @ 230858 -> 230B70 */ void func_80182088(struct Connection *cxn) { struct GdVec3f sp4C; - UNUSED u8 unused[0x24]; f32 sp24; f32 sp20; struct ObjParticle *sp1C; @@ -208,7 +205,6 @@ void func_801823A0(struct ObjNet *net) { /* 230CC0 -> 230DCC */ struct ObjParticle *make_particle(u32 flags, s32 colourNum, f32 x, f32 y, f32 z) { struct ObjParticle *particle = (struct ObjParticle *) make_object(OBJ_TYPE_PARTICLES); - UNUSED u8 unused[8]; particle->pos.x = x; particle->pos.y = y; @@ -317,13 +313,9 @@ void func_80182A08(struct ObjParticle *ptc, struct GdVec3f *b) { /* 231454 -> 231D40; orig name: Unknown80182C84 */ void move_particle(struct ObjParticle *ptc) { f32 sp7C; - UNUSED u8 unused2[12]; struct GdVec3f sp64; struct ObjParticle *sp60; - UNUSED u8 unused1[4]; s32 i; - UNUSED u8 unused4[4]; - UNUSED u8 unused5[4]; struct ObjCamera *sp4C; struct GdVec3f sp40; struct GdVec3f sp34; diff --git a/src/goddard/renderer.c b/src/goddard/renderer.c index d2d49600..b701067d 100644 --- a/src/goddard/renderer.c +++ b/src/goddard/renderer.c @@ -2635,11 +2635,8 @@ void gd_create_ortho_matrix(f32 l, f32 r, f32 b, f32 t, f32 n, f32 f) { /* 25245C -> 25262C */ void gd_create_perspective_matrix(f32 fovy, f32 aspect, f32 near, f32 far) { u16 perspNorm; - UNUSED u32 unused1; uintptr_t perspecMtx; uintptr_t rotMtx; - UNUSED u32 unused2; - UNUSED f32 unusedf = 0.0625f; sGdPerspTimer += 0.1; guPerspective(&DL_CURRENT_MTX(sCurrentGdDl), &perspNorm, fovy, aspect, near, far, 1.0f); diff --git a/src/goddard/shape_helper.c b/src/goddard/shape_helper.c index 36d4c17c..75f29b95 100644 --- a/src/goddard/shape_helper.c +++ b/src/goddard/shape_helper.c @@ -161,7 +161,7 @@ void calc_face_normal(struct ObjFace *face) { p3.z = vtx3->pos.z; // calculate the cross product of edges (p2 - p1) and (p3 - p2) - // not sure why each component is multiplied by 1000. maybe to avoid loss of precision when normalizing? + // not sure why each component is multiplied by 1000. maybe to avoid loss of precision when normalizing? normal.x = (((p2.y - p1.y) * (p3.z - p2.z)) - ((p2.z - p1.z) * (p3.y - p2.y))) * mul; normal.y = (((p2.z - p1.z) * (p3.x - p2.x)) - ((p2.x - p1.x) * (p3.z - p2.z))) * mul; normal.z = (((p2.x - p1.x) * (p3.y - p2.y)) - ((p2.y - p1.y) * (p3.x - p2.x))) * mul; diff --git a/src/goddard/skin.c b/src/goddard/skin.c index 069d0c55..de820bcf 100644 --- a/src/goddard/skin.c +++ b/src/goddard/skin.c @@ -300,10 +300,8 @@ void func_80192CCC(struct ObjNet *net) { /* 241768 -> 241AB4; orig name: func_80192F98 */ void convert_gd_verts_to_Vn(struct ObjGroup *grp) { - UNUSED u8 pad[0x40 - 0x2c]; Vtx *vn; // 28 u8 nx, ny, nz; // 24, 25, 26 - UNUSED u32 pad20; register struct VtxLink *vtxlink; // a1 #ifndef GBI_FLOATS register s16 *vnPos; // a2 diff --git a/src/hvqm/cfbkeep.c b/src/hvqm/cfbkeep.c index 1b076386..2f15b2b8 100644 --- a/src/hvqm/cfbkeep.c +++ b/src/hvqm/cfbkeep.c @@ -1,10 +1,10 @@ -/* +/* * N64-HVQM2 library Sample program - * + * * FILE : cfbkeep.c (frame buffer management) - * + * * Copyright (C) 1998,1999 NINTENDO Co.,Ltd. - * + * */ /* 1998-12-16 */ diff --git a/src/hvqm/getrecord.c b/src/hvqm/getrecord.c index 61ad39e8..42c4ee86 100644 --- a/src/hvqm/getrecord.c +++ b/src/hvqm/getrecord.c @@ -1,10 +1,10 @@ -/* +/* * N64-HVQM2 library Sample program - * + * * FILE : getrecord.c (module for reading HVQM2 records) - * + * * Copyright (C) 1998,1999 NINTENDO Co.,Ltd. - * + * */ /* 1999-02-22 */ @@ -14,7 +14,7 @@ #include "hvqm.h" /* - * u8 *get_record(HVQM2Record *headerbuf, void *bodybuf, + * u8 *get_record(HVQM2Record *headerbuf, void *bodybuf, * u16 type, u8 *stream, OSIoMesg *mb, OSMesgQueue *mq) * * Arguments @@ -24,20 +24,20 @@ * stream The current HVQM2 record address * mb I/O message block request sent to PI manager * mq Message queue receiving notice of DMA end from PI manager - * + * * Explanation: * Finds the next record of the specified "type" from the HVQM2 data * address "stream" in ROM, and reads the record header into "headerbuf" * and the data body into "bodybuf." Specify HVQM2_AUDIO for "type" to * read an audio record, and specify HVQM2_VIDEO to read a video record. * - * This function assumes that the reading of audio records and video - * records is performed in parallel by separate threads. Accordingly, + * This function assumes that the reading of audio records and video + * records is performed in parallel by separate threads. Accordingly, * you must prepare in advance a separate mb (I/O message block request * sent to PI manager) and separate mq (message queue receiving notice * of DMA end from PI manager) for audio records and video records. * - * The reading of audio records has priority over the reading of + * The reading of audio records has priority over the reading of * video records. * * "stream" must have 2byte alignment. Please give headerbuf and @@ -45,7 +45,7 @@ * size. * * Please be sure to reserve sufficient space for bodybuf. - * + * * * Returned value: * The address of the next record @@ -65,7 +65,7 @@ get_record( HVQM2Record *headerbuf, void *bodybuf, u16 type, u8 *stream, OSIoMes record_size = load32( headerbuf->size ); if ( record_type == type ) break; stream += record_size; - } + } if ( record_size > 0 ) { romcpy( bodybuf, stream, record_size, pri, mb, mq ); diff --git a/src/hvqm/hvqm.c b/src/hvqm/hvqm.c index 9aabc1b6..1ca1c3bd 100644 --- a/src/hvqm/hvqm.c +++ b/src/hvqm/hvqm.c @@ -12,8 +12,8 @@ static OSMesgQueue audioDmaMessageQ; static OSMesg audioDmaMessages[AUDIO_DMA_MSG_SIZE]; /*********************************************************************** - * Message queue for receiving message blocks and end of DMA - * notifications when requesting that video records be read from + * Message queue for receiving message blocks and end of DMA + * notifications when requesting that video records be read from * the HVQM2 data (ROM). ***********************************************************************/ #define VIDEO_DMA_MSG_SIZE 1 @@ -50,7 +50,7 @@ static u64 disptime; /* Counter for scheduled display time of next video frame static ADPCMstate adpcm_state; /* Buffer for state information passed to the ADPCM decoder */ /* - * Macro for loading multi-byte data from buffer holding data from stream + * Macro for loading multi-byte data from buffer holding data from stream */ #define load32(from) (*(u32*)&(from)) #define load16(from) (*(u16*)&(from)) @@ -99,16 +99,16 @@ void hvqm_main_proc() { u32 usec_per_frame; int prev_bufno = -1; - + hvqm_header = OS_DCACHE_ROUNDUP_ADDR( hvqm_headerBuf ); - + osCreateMesgQueue( &spMesgQ, &spMesgBuf, 1 ); osSetEventMesg( OS_EVENT_SP, &spMesgQ, NULL ); - + osCreateMesgQueue( &audioDmaMessageQ, audioDmaMessages, AUDIO_DMA_MSG_SIZE ); osCreateMesgQueue( &videoDmaMessageQ, videoDmaMessages, VIDEO_DMA_MSG_SIZE ); createTimekeeper(); - + hvqm2InitSP1(0xff); hvqtask.t.ucode = (u64 *)hvqm2sp1TextStart; hvqtask.t.ucode_size = (int)hvqm2sp1TextEnd - (int)hvqm2sp1TextStart; @@ -130,12 +130,12 @@ void hvqm_main_proc() { total_frames = load32(hvqm_header->total_frames); usec_per_frame = load32(hvqm_header->usec_per_frame); total_audio_records = load32(hvqm_header->total_audio_records); - + hvqm2SetupSP1(hvqm_header, SCREEN_WD); - + release_all_cfb(); tkStart( &rewind, load32( hvqm_header->samples_per_sec ) ); - + for ( ; ; ) { //while ( video_remain > 0 ) { @@ -152,13 +152,13 @@ void hvqm_main_proc() { //if ( video_remain == 0 ) break; } } - + record_header = OS_DCACHE_ROUNDUP_ADDR( header_buffer ); - - video_streamP = get_record(record_header, hvqbuf, - HVQM2_VIDEO, video_streamP, + + video_streamP = get_record(record_header, hvqbuf, + HVQM2_VIDEO, video_streamP, &videoDmaMesgBlock, &videoDmaMessageQ); - + //! SYNC VIDEO code if ( disptime > 0 && tkGetTime() > 0) { @@ -167,18 +167,18 @@ void hvqm_main_proc() { do { disptime += usec_per_frame; if ( --video_remain == 0 ) break; - video_streamP = get_record( record_header, hvqbuf, - HVQM2_VIDEO, video_streamP, + video_streamP = get_record( record_header, hvqbuf, + HVQM2_VIDEO, video_streamP, &videoDmaMesgBlock, &videoDmaMessageQ ); } while (load16( record_header->format ) != HVQM2_VIDEO_KEYFRAME || tkGetTime() > disptime ); if ( video_remain == 0 ) break; } } - + frame_format = load16(record_header->format); if (frame_format == HVQM2_VIDEO_HOLD) { /* - * Just like when frame_format != HVQM2_VIDEO_HOLD you + * Just like when frame_format != HVQM2_VIDEO_HOLD you * could call hvqm2Decode*() and decode in a new frame * buffer (in this case, just copying from the buffer of * the preceding frame). But here we make use of the @@ -194,9 +194,9 @@ void hvqm_main_proc() { * Process first half in the CPU */ hvqtask.t.flags = 0; - status = hvqm2DecodeSP1( hvqbuf, frame_format, - &gFrameBuffers[bufno][screen_offset], - &gFrameBuffers[prev_bufno][screen_offset], + status = hvqm2DecodeSP1( hvqbuf, frame_format, + &gFrameBuffers[bufno][screen_offset], + &gFrameBuffers[prev_bufno][screen_offset], hvqwork, &hvq_sparg, hvq_spfifo ); osWritebackDCacheAll(); @@ -210,10 +210,10 @@ void hvqm_main_proc() { osRecvMesg( &spMesgQ, NULL, OS_MESG_BLOCK ); } } - + keep_cfb( bufno ); - - if ( prev_bufno >= 0 && prev_bufno != bufno ) + + if ( prev_bufno >= 0 && prev_bufno != bufno ) release_cfb( prev_bufno ); tkPushVideoframe( gFrameBuffers[bufno], &cfb_status[bufno], disptime ); @@ -221,7 +221,7 @@ void hvqm_main_proc() { prev_bufno = bufno; disptime += usec_per_frame; --video_remain; - + //if (1) { //osAiSetFrequency(gAudioSessionPresets[0].frequency); //osSendMesg(&gDmaMesgQueue, 0, OS_MESG_BLOCK); @@ -232,7 +232,7 @@ void hvqm_main_proc() { void createHvqmThread(void) { osCreateMesgQueue( &hvqmMesgQ, &hvqmMesgBuf, 1 ); - osCreateThread( &hvqmThread, HVQM_THREAD_ID, hvqm_main_proc, - NULL, hvqmStack + (STACKSIZE/sizeof(u64)), + osCreateThread( &hvqmThread, HVQM_THREAD_ID, hvqm_main_proc, + NULL, hvqmStack + (STACKSIZE/sizeof(u64)), (OSPri)HVQM_PRIORITY ); } \ No newline at end of file diff --git a/src/hvqm/hvqm.h b/src/hvqm/hvqm.h index ba994c8c..867194d3 100644 --- a/src/hvqm/hvqm.h +++ b/src/hvqm/hvqm.h @@ -8,7 +8,7 @@ #define HVQ_SPFIFO_SIZE 30000 /* - * Size of buffer for video records + * Size of buffer for video records */ #define HVQ_DATASIZE_MAX 40000 @@ -58,7 +58,7 @@ #define PCMBUF_SIZE 0xA00 /* - * Macro for loading multi-byte data from buffer holding data from stream + * Macro for loading multi-byte data from buffer holding data from stream */ #define load32(from) (*(u32*)&(from)) #define load16(from) (*(u16*)&(from)) diff --git a/src/hvqm/system.c b/src/hvqm/system.c index 175dcdd0..dc0532b9 100644 --- a/src/hvqm/system.c +++ b/src/hvqm/system.c @@ -1,10 +1,10 @@ -/* +/* * N64-HVQM2 library Sample program - * + * * FILE : system.c (boot program/system utility) - * + * * Copyright (C) 1998,1999 NINTENDO Co.,Ltd. - * + * */ /* 1998-12-15 */ @@ -15,7 +15,7 @@ /*********************************************************************** * - * void romcpy(void *dest, void *src, u32 len, s32 pri, OSIoMesg *mb, + * void romcpy(void *dest, void *src, u32 len, s32 pri, OSIoMesg *mb, * OSMesgQueue *mq) * * Arguments @@ -27,12 +27,12 @@ * mq Message queue receiving notification of end of DMA * * Explanation - * DMA transfers "len" bytes from ROM address "SRC" to DRAM + * DMA transfers "len" bytes from ROM address "SRC" to DRAM * address "dest" and returns after waiting for end of DMA. The - * data cache of the transfer destination in DRAM is invalidated + * data cache of the transfer destination in DRAM is invalidated * ahead of time. * - * The parameters have the same meaning as for osPiStartDma() + * The parameters have the same meaning as for osPiStartDma() * ***********************************************************************/ void diff --git a/src/hvqm/timekeeper.c b/src/hvqm/timekeeper.c index 5cd55f7b..8c8a8ab2 100644 --- a/src/hvqm/timekeeper.c +++ b/src/hvqm/timekeeper.c @@ -53,7 +53,7 @@ static OSMesg aiMessages[AI_MSG_SIZE]; /*********************************************************************** * Ring buffer for reserving display of image * - * As soon as image (frame buffer) is complete, put into this + * As soon as image (frame buffer) is complete, put into this * ring buffer, wait for display time to come and set in VI. ***********************************************************************/ #define VIDEO_RING_SIZE NUM_CFBs @@ -70,7 +70,7 @@ static int videoRingRead; /* Ring buffer read index */ /*********************************************************************** * Ring buffer for reserving playback of audio - * + * * As soon as audio (PCM data) is complete, put into this * ring buffer and push as soon as AI FIFO is free. ***********************************************************************/ @@ -93,7 +93,7 @@ static u32 aiFIFOsamples; /* Number of PCM samples waiting in AI FIFO */ static u32 aiDAsamples; /* Number of samples AI is DMA transferring to DA */ /*********************************************************************** - * Buffer for matching PCM transfer data length to PCM_ALIGN + * Buffer for matching PCM transfer data length to PCM_ALIGN ***********************************************************************/ static s16 pcmModBuf[(PCM_ALIGN-1)*PCM_CHANNELS]; @@ -133,7 +133,7 @@ static OSTime last_time; * The time that has passed since the start of HVQM2 movie playback * is calculated back from the number of samples that have finished * playing (samples_played) and the sampling rate (samples_per_sec). - * The time after samples_played was first updated is supplemented + * The time after samples_played was first updated is supplemented * with osGetTime(). * * Returned value @@ -219,7 +219,7 @@ static void timekeeperProc(void UNUSED*argument) { s32 pcm_mod_samples; /* The number of PCM samples left over */ tkAudioProc audioproc; OSTime present_vtime; - + /* Acquire retrace event */ osCreateMesgQueue( &viMessageQ, viMessages, VI_MSG_SIZE ); osViSetEvent( &viMessageQ, 0, 1 ); @@ -231,11 +231,11 @@ static void timekeeperProc(void UNUSED*argument) { /* * Create and start audio DA counter thread */ - osCreateThread(&daCounterThread, DA_COUNTER_THREAD_ID, daCounterProc, - NULL, daCounterStack + (STACKSIZE/sizeof(u64)), + osCreateThread(&daCounterThread, DA_COUNTER_THREAD_ID, daCounterProc, + NULL, daCounterStack + (STACKSIZE/sizeof(u64)), (OSPri)DA_COUNTER_PRIORITY); osStartThread(&daCounterThread); - + osRecvMesg(&tkCmdMesgQ, (OSMesg *)&cmd, OS_MESG_BLOCK); /* @@ -245,10 +245,10 @@ static void timekeeperProc(void UNUSED*argument) { osSendMesg( &tkResMesgQ, NULL, OS_MESG_BLOCK ); osRecvMesg( &tkCmdMesgQ, (OSMesg *)&cmd, OS_MESG_BLOCK ); } - + tkClockDisable(); audioproc = (cmd->rewind)(); - + samples_per_sec = cmd->samples_per_sec; if (samples_per_sec) osAiSetFrequency(samples_per_sec); @@ -275,7 +275,7 @@ static void timekeeperProc(void UNUSED*argument) { osSendMesg( &tkResMesgQ, NULL, OS_MESG_BLOCK ); /* Notification that playback preparations are finished */ present_vtime = osGetTime(); - + while (!video_done || videoRingCount > 0 || pushed_cfb != NULL || !audio_done || audioRingCount > 0 || aiFIFOsamples > 0) { u64 present_time; @@ -288,7 +288,7 @@ static void timekeeperProc(void UNUSED*argument) { last_vtime = present_vtime; present_vtime = osGetTime(); present_time = tkGetTime() + OS_CYCLES_TO_USEC(present_vtime - last_vtime); - + if (pushed_cfb != NULL) { /* The display has switched from showing_cfb to pushed_cfb (it should have) */ if (!video_started) { @@ -311,11 +311,11 @@ static void timekeeperProc(void UNUSED*argument) { pushed_cfb = NULL; pushed_cfb_statP = NULL; } - + /* * Push the next frame buffer to the VI * - * Before the start of video display (video_started == 0), + * Before the start of video display (video_started == 0), * wait until audio data is prepared for playback * (audioRingCount > 0). */ @@ -331,12 +331,12 @@ static void timekeeperProc(void UNUSED*argument) { --videoRingCount; } } - + /* * Push the next PCM data to the AI * - * Before the start of video display (video_started == 0) - * wait until the display of the first image frame + * Before the start of video display (video_started == 0) + * wait until the display of the first image frame * has begun (video_started == 1). */ if ( video_started ) { @@ -398,14 +398,14 @@ static void timekeeperProc(void UNUSED*argument) { } else audio_done = 1; } - + if ( osRecvMesg( &tkCmdMesgQ, (OSMesg *)&cmd, OS_MESG_NOBLOCK ) == 0 ) { /* * tkStop() or tkStart() has been executed - * + * * Set 1 in video_done and end this playback loop - * after playback of the current movie's video and + * after playback of the current movie's video and * and audio has completely finished. */ video_done = 1; @@ -426,8 +426,8 @@ createTimekeeper(void) { osCreateMesgQueue( &tkCmdMesgQ, &tkCmdMesgBuf, 1 ); osCreateMesgQueue( &tkResMesgQ, &tkResMesgBuf, 1 ); - osCreateThread( &tkThread, TIMEKEEPER_THREAD_ID, timekeeperProc, - NULL, tkStack + (STACKSIZE/sizeof(u64)), + osCreateThread( &tkThread, TIMEKEEPER_THREAD_ID, timekeeperProc, + NULL, tkStack + (STACKSIZE/sizeof(u64)), (OSPri)TIMEKEEPER_PRIORITY ); osStartThread( &tkThread ); } @@ -443,9 +443,9 @@ createTimekeeper(void) * Directs the timekeeper to play a new movie. Playback of the * movie starts after callback of "rewind" by the timekeeper. After * this, the HVQM2 video records are read and decoded and the - * completed frame buffers are handed over to the timekeeper by + * completed frame buffers are handed over to the timekeeper by * tkPushVideoframe() in succession to play the video part of the movie. - * As for the audio, the timekeeper itself calls the callback + * As for the audio, the timekeeper itself calls the callback * function (the value returned by rewind) that gets the PCM data as * needed to playback the audio. * @@ -485,7 +485,7 @@ tkStop( void ) /*********************************************************************** * * void tkPushVideoframe(void *vaddr, u32 *statP, u64 disptime) - * + * * Argument * vaddr Frame buffer address * statP Pointer to state flag data regarding vaddr @@ -496,8 +496,8 @@ tkStop( void ) * The timekeeper displays the frame buffer after waiting for the * "disptime" amount of time to pass from the start of the movie. * - * To wait for the display of the vaddr frame buffer or to - * indicate that something is being displayed, the CFB_SHOWING + * To wait for the display of the vaddr frame buffer or to + * indicate that something is being displayed, the CFB_SHOWING * flag is set in the u32 type data pointed to by the statP pointer. * At the time when display of vaddr is finished, (once its display * is over and display has switched to another frame buffer) this diff --git a/src/libz/gzip.c b/src/libz/gzip.c index cb80fedb..c76532a6 100644 --- a/src/libz/gzip.c +++ b/src/libz/gzip.c @@ -51,7 +51,7 @@ expand_gzip(char *in, char *outbuf, unsigned int inLength, unsigned int outbufLe d_stream.avail_out = outbufLength; /* - * Must pass -ve window bits to tell inflate not to expect + * Must pass -ve window bits to tell inflate not to expect * a gzip or zlib header */ err = inflateInit2(&d_stream, -MAX_WBITS); diff --git a/src/menu/file_select.c b/src/menu/file_select.c index b7f29870..61e8d3aa 100644 --- a/src/menu/file_select.c +++ b/src/menu/file_select.c @@ -2284,9 +2284,6 @@ void print_save_file_scores(s8 fileIndex) { * Also checks if all saves exists and defines text and main menu timers. */ void print_file_select_strings(void) { - UNUSED s32 unused1; - UNUSED s32 unused2; - create_dl_ortho_matrix(); switch (sSelectedButtonID) { case MENU_BUTTON_NONE: diff --git a/src/s2d_engine/fonts/comicsans.c b/src/s2d_engine/fonts/comicsans.c index cece0df8..f4afda80 100644 --- a/src/s2d_engine/fonts/comicsans.c +++ b/src/s2d_engine/fonts/comicsans.c @@ -386,7 +386,7 @@ Gfx comicsans_align_127[] = {gsSPEndDisplayList()}; uObjTxtr comicsans_tex[] = { { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_0, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -396,7 +396,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_1, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -406,7 +406,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_2, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -416,7 +416,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_3, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -426,7 +426,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_4, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -436,7 +436,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_5, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -446,7 +446,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_6, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -456,7 +456,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_7, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -466,7 +466,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_8, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -476,7 +476,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_9, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -486,7 +486,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_10, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -496,7 +496,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_11, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -506,7 +506,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_12, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -516,7 +516,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_13, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -526,7 +526,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_14, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -536,7 +536,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_15, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -546,7 +546,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_16, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -556,7 +556,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_17, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -566,7 +566,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_18, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -576,7 +576,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_19, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -586,7 +586,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_20, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -596,7 +596,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_21, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -606,7 +606,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_22, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -616,7 +616,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_23, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -626,7 +626,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_24, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -636,7 +636,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_25, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -646,7 +646,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_26, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -656,7 +656,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_27, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -666,7 +666,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_28, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -676,7 +676,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_29, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -686,7 +686,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_30, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -696,7 +696,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_31, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -706,7 +706,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_32, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -716,7 +716,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_33, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -726,7 +726,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_34, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -736,7 +736,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_35, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -746,7 +746,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_36, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -756,7 +756,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_37, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -766,7 +766,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_38, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -776,7 +776,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_39, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -786,7 +786,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_40, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -796,7 +796,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_41, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -806,7 +806,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_42, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -816,7 +816,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_43, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -826,7 +826,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_44, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -836,7 +836,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_45, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -846,7 +846,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_46, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -856,7 +856,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_47, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -866,7 +866,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_48, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -876,7 +876,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_49, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -886,7 +886,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_50, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -896,7 +896,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_51, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -906,7 +906,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_52, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -916,7 +916,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_53, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -926,7 +926,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_54, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -936,7 +936,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_55, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -946,7 +946,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_56, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -956,7 +956,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_57, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -966,7 +966,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_58, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -976,7 +976,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_59, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -986,7 +986,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_60, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -996,7 +996,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_61, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1006,7 +1006,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_62, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1016,7 +1016,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_63, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1026,7 +1026,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_64, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1036,7 +1036,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_65, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1046,7 +1046,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_66, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1056,7 +1056,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_67, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1066,7 +1066,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_68, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1076,7 +1076,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_69, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1086,7 +1086,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_70, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1096,7 +1096,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_71, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1106,7 +1106,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_72, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1116,7 +1116,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_73, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1126,7 +1126,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_74, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1136,7 +1136,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_75, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1146,7 +1146,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_76, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1156,7 +1156,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_77, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1166,7 +1166,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_78, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1176,7 +1176,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_79, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1186,7 +1186,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_80, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1196,7 +1196,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_81, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1206,7 +1206,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_82, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1216,7 +1216,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_83, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1226,7 +1226,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_84, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1236,7 +1236,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_85, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1246,7 +1246,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_86, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1256,7 +1256,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_87, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1266,7 +1266,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_88, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1276,7 +1276,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_89, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1286,7 +1286,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_90, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1296,7 +1296,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_91, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1306,7 +1306,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_92, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1316,7 +1316,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_93, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1326,7 +1326,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_94, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1336,7 +1336,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_95, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1346,7 +1346,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_96, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1356,7 +1356,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_97, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1366,7 +1366,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_98, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1376,7 +1376,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_99, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1386,7 +1386,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_100, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1396,7 +1396,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_101, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1406,7 +1406,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_102, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1416,7 +1416,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_103, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1426,7 +1426,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_104, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1436,7 +1436,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_105, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1446,7 +1446,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_106, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1456,7 +1456,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_107, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1466,7 +1466,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_108, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1476,7 +1476,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_109, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1486,7 +1486,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_110, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1496,7 +1496,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_111, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1506,7 +1506,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_112, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1516,7 +1516,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_113, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1526,7 +1526,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_114, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1536,7 +1536,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_115, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1546,7 +1546,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_116, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1556,7 +1556,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_117, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1566,7 +1566,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_118, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1576,7 +1576,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_119, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1586,7 +1586,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_120, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1596,7 +1596,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_121, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1606,7 +1606,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_122, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1616,7 +1616,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_123, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1626,7 +1626,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_124, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1636,7 +1636,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_125, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1646,7 +1646,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_126, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1656,7 +1656,7 @@ uObjTxtr comicsans_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &comicsans_tex_127, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ diff --git a/src/s2d_engine/fonts/delfino.c b/src/s2d_engine/fonts/delfino.c index a5fcdf50..5f6be90b 100644 --- a/src/s2d_engine/fonts/delfino.c +++ b/src/s2d_engine/fonts/delfino.c @@ -386,7 +386,7 @@ Gfx delfino_align_127[] = {gsSPEndDisplayList()}; uObjTxtr delfino_tex[] = { { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_0, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -396,7 +396,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_1, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -406,7 +406,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_2, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -416,7 +416,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_3, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -426,7 +426,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_4, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -436,7 +436,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_5, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -446,7 +446,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_6, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -456,7 +456,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_7, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -466,7 +466,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_8, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -476,7 +476,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_9, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -486,7 +486,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_10, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -496,7 +496,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_11, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -506,7 +506,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_12, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -516,7 +516,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_13, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -526,7 +526,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_14, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -536,7 +536,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_15, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -546,7 +546,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_16, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -556,7 +556,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_17, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -566,7 +566,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_18, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -576,7 +576,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_19, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -586,7 +586,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_20, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -596,7 +596,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_21, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -606,7 +606,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_22, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -616,7 +616,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_23, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -626,7 +626,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_24, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -636,7 +636,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_25, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -646,7 +646,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_26, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -656,7 +656,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_27, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -666,7 +666,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_28, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -676,7 +676,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_29, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -686,7 +686,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_30, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -696,7 +696,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_31, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -706,7 +706,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_32, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -716,7 +716,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_33, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -726,7 +726,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_34, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -736,7 +736,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_35, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -746,7 +746,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_36, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -756,7 +756,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_37, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -766,7 +766,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_38, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -776,7 +776,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_39, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -786,7 +786,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_40, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -796,7 +796,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_41, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -806,7 +806,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_42, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -816,7 +816,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_43, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -826,7 +826,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_44, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -836,7 +836,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_45, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -846,7 +846,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_46, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -856,7 +856,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_47, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -866,7 +866,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_48, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -876,7 +876,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_49, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -886,7 +886,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_50, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -896,7 +896,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_51, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -906,7 +906,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_52, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -916,7 +916,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_53, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -926,7 +926,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_54, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -936,7 +936,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_55, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -946,7 +946,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_56, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -956,7 +956,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_57, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -966,7 +966,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_58, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -976,7 +976,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_59, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -986,7 +986,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_60, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -996,7 +996,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_61, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1006,7 +1006,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_62, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1016,7 +1016,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_63, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1026,7 +1026,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_64, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1036,7 +1036,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_65, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1046,7 +1046,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_66, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1056,7 +1056,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_67, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1066,7 +1066,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_68, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1076,7 +1076,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_69, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1086,7 +1086,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_70, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1096,7 +1096,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_71, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1106,7 +1106,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_72, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1116,7 +1116,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_73, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1126,7 +1126,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_74, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1136,7 +1136,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_75, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1146,7 +1146,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_76, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1156,7 +1156,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_77, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1166,7 +1166,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_78, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1176,7 +1176,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_79, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1186,7 +1186,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_80, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1196,7 +1196,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_81, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1206,7 +1206,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_82, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1216,7 +1216,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_83, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1226,7 +1226,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_84, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1236,7 +1236,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_85, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1246,7 +1246,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_86, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1256,7 +1256,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_87, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1266,7 +1266,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_88, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1276,7 +1276,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_89, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1286,7 +1286,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_90, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1296,7 +1296,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_91, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1306,7 +1306,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_92, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1316,7 +1316,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_93, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1326,7 +1326,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_94, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1336,7 +1336,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_95, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1346,7 +1346,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_96, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1356,7 +1356,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_97, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1366,7 +1366,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_98, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1376,7 +1376,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_99, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1386,7 +1386,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_100, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1396,7 +1396,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_101, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1406,7 +1406,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_102, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1416,7 +1416,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_103, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1426,7 +1426,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_104, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1436,7 +1436,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_105, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1446,7 +1446,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_106, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1456,7 +1456,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_107, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1466,7 +1466,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_108, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1476,7 +1476,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_109, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1486,7 +1486,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_110, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1496,7 +1496,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_111, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1506,7 +1506,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_112, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1516,7 +1516,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_113, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1526,7 +1526,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_114, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1536,7 +1536,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_115, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1546,7 +1546,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_116, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1556,7 +1556,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_117, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1566,7 +1566,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_118, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1576,7 +1576,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_119, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1586,7 +1586,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_120, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1596,7 +1596,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_121, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1606,7 +1606,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_122, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1616,7 +1616,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_123, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1626,7 +1626,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_124, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1636,7 +1636,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_125, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1646,7 +1646,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_126, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1656,7 +1656,7 @@ uObjTxtr delfino_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &delfino_tex_127, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ diff --git a/src/s2d_engine/fonts/impact.c b/src/s2d_engine/fonts/impact.c index c94c62fd..8034968a 100644 --- a/src/s2d_engine/fonts/impact.c +++ b/src/s2d_engine/fonts/impact.c @@ -386,7 +386,7 @@ Gfx impact_align_127[] = {gsSPEndDisplayList()}; uObjTxtr impact_tex[] = { { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_0, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -396,7 +396,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_1, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -406,7 +406,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_2, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -416,7 +416,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_3, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -426,7 +426,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_4, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -436,7 +436,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_5, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -446,7 +446,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_6, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -456,7 +456,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_7, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -466,7 +466,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_8, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -476,7 +476,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_9, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -486,7 +486,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_10, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -496,7 +496,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_11, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -506,7 +506,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_12, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -516,7 +516,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_13, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -526,7 +526,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_14, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -536,7 +536,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_15, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -546,7 +546,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_16, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -556,7 +556,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_17, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -566,7 +566,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_18, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -576,7 +576,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_19, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -586,7 +586,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_20, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -596,7 +596,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_21, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -606,7 +606,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_22, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -616,7 +616,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_23, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -626,7 +626,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_24, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -636,7 +636,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_25, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -646,7 +646,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_26, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -656,7 +656,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_27, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -666,7 +666,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_28, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -676,7 +676,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_29, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -686,7 +686,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_30, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -696,7 +696,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_31, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -706,7 +706,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_32, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -716,7 +716,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_33, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -726,7 +726,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_34, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -736,7 +736,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_35, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -746,7 +746,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_36, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -756,7 +756,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_37, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -766,7 +766,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_38, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -776,7 +776,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_39, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -786,7 +786,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_40, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -796,7 +796,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_41, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -806,7 +806,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_42, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -816,7 +816,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_43, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -826,7 +826,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_44, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -836,7 +836,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_45, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -846,7 +846,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_46, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -856,7 +856,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_47, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -866,7 +866,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_48, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -876,7 +876,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_49, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -886,7 +886,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_50, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -896,7 +896,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_51, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -906,7 +906,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_52, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -916,7 +916,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_53, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -926,7 +926,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_54, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -936,7 +936,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_55, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -946,7 +946,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_56, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -956,7 +956,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_57, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -966,7 +966,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_58, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -976,7 +976,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_59, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -986,7 +986,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_60, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -996,7 +996,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_61, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1006,7 +1006,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_62, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1016,7 +1016,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_63, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1026,7 +1026,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_64, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1036,7 +1036,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_65, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1046,7 +1046,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_66, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1056,7 +1056,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_67, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1066,7 +1066,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_68, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1076,7 +1076,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_69, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1086,7 +1086,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_70, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1096,7 +1096,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_71, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1106,7 +1106,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_72, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1116,7 +1116,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_73, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1126,7 +1126,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_74, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1136,7 +1136,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_75, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1146,7 +1146,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_76, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1156,7 +1156,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_77, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1166,7 +1166,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_78, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1176,7 +1176,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_79, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1186,7 +1186,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_80, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1196,7 +1196,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_81, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1206,7 +1206,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_82, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1216,7 +1216,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_83, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1226,7 +1226,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_84, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1236,7 +1236,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_85, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1246,7 +1246,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_86, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1256,7 +1256,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_87, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1266,7 +1266,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_88, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1276,7 +1276,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_89, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1286,7 +1286,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_90, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1296,7 +1296,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_91, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1306,7 +1306,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_92, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1316,7 +1316,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_93, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1326,7 +1326,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_94, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1336,7 +1336,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_95, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1346,7 +1346,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_96, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1356,7 +1356,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_97, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1366,7 +1366,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_98, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1376,7 +1376,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_99, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1386,7 +1386,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_100, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1396,7 +1396,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_101, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1406,7 +1406,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_102, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1416,7 +1416,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_103, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1426,7 +1426,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_104, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1436,7 +1436,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_105, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1446,7 +1446,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_106, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1456,7 +1456,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_107, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1466,7 +1466,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_108, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1476,7 +1476,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_109, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1486,7 +1486,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_110, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1496,7 +1496,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_111, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1506,7 +1506,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_112, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1516,7 +1516,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_113, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1526,7 +1526,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_114, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1536,7 +1536,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_115, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1546,7 +1546,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_116, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1556,7 +1556,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_117, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1566,7 +1566,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_118, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1576,7 +1576,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_119, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1586,7 +1586,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_120, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1596,7 +1596,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_121, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1606,7 +1606,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_122, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1616,7 +1616,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_123, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1626,7 +1626,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_124, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1636,7 +1636,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_125, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1646,7 +1646,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_126, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1656,7 +1656,7 @@ uObjTxtr impact_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &impact_tex_127, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ diff --git a/src/s2d_engine/fonts/papyrus.c b/src/s2d_engine/fonts/papyrus.c index bd12ec4e..d91af8bf 100644 --- a/src/s2d_engine/fonts/papyrus.c +++ b/src/s2d_engine/fonts/papyrus.c @@ -386,7 +386,7 @@ Gfx papyrus_align_127[] = {gsSPEndDisplayList()}; uObjTxtr papyrus_tex[] = { { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_0, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -396,7 +396,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_1, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -406,7 +406,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_2, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -416,7 +416,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_3, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -426,7 +426,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_4, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -436,7 +436,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_5, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -446,7 +446,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_6, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -456,7 +456,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_7, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -466,7 +466,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_8, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -476,7 +476,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_9, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -486,7 +486,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_10, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -496,7 +496,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_11, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -506,7 +506,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_12, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -516,7 +516,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_13, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -526,7 +526,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_14, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -536,7 +536,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_15, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -546,7 +546,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_16, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -556,7 +556,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_17, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -566,7 +566,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_18, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -576,7 +576,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_19, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -586,7 +586,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_20, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -596,7 +596,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_21, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -606,7 +606,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_22, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -616,7 +616,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_23, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -626,7 +626,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_24, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -636,7 +636,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_25, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -646,7 +646,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_26, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -656,7 +656,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_27, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -666,7 +666,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_28, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -676,7 +676,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_29, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -686,7 +686,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_30, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -696,7 +696,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_31, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -706,7 +706,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_32, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -716,7 +716,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_33, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -726,7 +726,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_34, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -736,7 +736,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_35, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -746,7 +746,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_36, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -756,7 +756,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_37, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -766,7 +766,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_38, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -776,7 +776,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_39, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -786,7 +786,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_40, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -796,7 +796,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_41, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -806,7 +806,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_42, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -816,7 +816,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_43, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -826,7 +826,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_44, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -836,7 +836,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_45, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -846,7 +846,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_46, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -856,7 +856,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_47, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -866,7 +866,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_48, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -876,7 +876,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_49, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -886,7 +886,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_50, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -896,7 +896,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_51, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -906,7 +906,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_52, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -916,7 +916,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_53, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -926,7 +926,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_54, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -936,7 +936,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_55, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -946,7 +946,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_56, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -956,7 +956,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_57, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -966,7 +966,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_58, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -976,7 +976,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_59, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -986,7 +986,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_60, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -996,7 +996,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_61, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1006,7 +1006,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_62, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1016,7 +1016,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_63, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1026,7 +1026,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_64, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1036,7 +1036,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_65, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1046,7 +1046,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_66, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1056,7 +1056,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_67, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1066,7 +1066,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_68, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1076,7 +1076,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_69, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1086,7 +1086,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_70, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1096,7 +1096,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_71, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1106,7 +1106,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_72, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1116,7 +1116,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_73, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1126,7 +1126,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_74, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1136,7 +1136,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_75, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1146,7 +1146,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_76, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1156,7 +1156,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_77, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1166,7 +1166,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_78, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1176,7 +1176,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_79, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1186,7 +1186,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_80, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1196,7 +1196,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_81, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1206,7 +1206,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_82, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1216,7 +1216,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_83, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1226,7 +1226,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_84, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1236,7 +1236,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_85, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1246,7 +1246,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_86, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1256,7 +1256,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_87, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1266,7 +1266,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_88, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1276,7 +1276,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_89, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1286,7 +1286,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_90, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1296,7 +1296,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_91, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1306,7 +1306,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_92, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1316,7 +1316,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_93, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1326,7 +1326,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_94, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1336,7 +1336,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_95, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1346,7 +1346,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_96, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1356,7 +1356,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_97, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1366,7 +1366,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_98, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1376,7 +1376,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_99, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1386,7 +1386,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_100, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1396,7 +1396,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_101, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1406,7 +1406,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_102, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1416,7 +1416,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_103, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1426,7 +1426,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_104, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1436,7 +1436,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_105, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1446,7 +1446,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_106, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1456,7 +1456,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_107, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1466,7 +1466,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_108, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1476,7 +1476,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_109, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1486,7 +1486,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_110, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1496,7 +1496,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_111, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1506,7 +1506,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_112, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1516,7 +1516,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_113, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1526,7 +1526,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_114, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1536,7 +1536,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_115, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1546,7 +1546,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_116, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1556,7 +1556,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_117, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1566,7 +1566,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_118, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1576,7 +1576,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_119, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1586,7 +1586,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_120, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1596,7 +1596,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_121, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1606,7 +1606,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_122, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1616,7 +1616,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_123, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1626,7 +1626,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_124, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1636,7 +1636,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_125, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1646,7 +1646,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_126, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1656,7 +1656,7 @@ uObjTxtr papyrus_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &papyrus_tex_127, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ diff --git a/src/s2d_engine/fonts/timesnewroman.c b/src/s2d_engine/fonts/timesnewroman.c index 81b7e7eb..7ad517af 100644 --- a/src/s2d_engine/fonts/timesnewroman.c +++ b/src/s2d_engine/fonts/timesnewroman.c @@ -386,7 +386,7 @@ Gfx timesnewroman_align_127[] = {gsSPEndDisplayList()}; uObjTxtr timesnewroman_tex[] = { { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_0, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -396,7 +396,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_1, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -406,7 +406,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_2, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -416,7 +416,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_3, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -426,7 +426,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_4, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -436,7 +436,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_5, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -446,7 +446,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_6, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -456,7 +456,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_7, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -466,7 +466,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_8, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -476,7 +476,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_9, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -486,7 +486,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_10, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -496,7 +496,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_11, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -506,7 +506,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_12, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -516,7 +516,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_13, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -526,7 +526,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_14, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -536,7 +536,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_15, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -546,7 +546,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_16, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -556,7 +556,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_17, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -566,7 +566,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_18, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -576,7 +576,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_19, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -586,7 +586,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_20, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -596,7 +596,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_21, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -606,7 +606,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_22, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -616,7 +616,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_23, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -626,7 +626,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_24, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -636,7 +636,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_25, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -646,7 +646,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_26, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -656,7 +656,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_27, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -666,7 +666,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_28, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -676,7 +676,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_29, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -686,7 +686,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_30, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -696,7 +696,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_31, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -706,7 +706,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_32, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -716,7 +716,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_33, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -726,7 +726,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_34, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -736,7 +736,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_35, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -746,7 +746,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_36, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -756,7 +756,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_37, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -766,7 +766,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_38, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -776,7 +776,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_39, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -786,7 +786,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_40, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -796,7 +796,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_41, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -806,7 +806,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_42, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -816,7 +816,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_43, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -826,7 +826,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_44, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -836,7 +836,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_45, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -846,7 +846,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_46, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -856,7 +856,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_47, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -866,7 +866,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_48, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -876,7 +876,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_49, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -886,7 +886,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_50, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -896,7 +896,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_51, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -906,7 +906,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_52, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -916,7 +916,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_53, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -926,7 +926,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_54, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -936,7 +936,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_55, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -946,7 +946,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_56, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -956,7 +956,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_57, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -966,7 +966,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_58, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -976,7 +976,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_59, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -986,7 +986,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_60, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -996,7 +996,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_61, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1006,7 +1006,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_62, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1016,7 +1016,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_63, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1026,7 +1026,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_64, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1036,7 +1036,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_65, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1046,7 +1046,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_66, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1056,7 +1056,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_67, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1066,7 +1066,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_68, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1076,7 +1076,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_69, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1086,7 +1086,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_70, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1096,7 +1096,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_71, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1106,7 +1106,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_72, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1116,7 +1116,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_73, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1126,7 +1126,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_74, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1136,7 +1136,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_75, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1146,7 +1146,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_76, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1156,7 +1156,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_77, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1166,7 +1166,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_78, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1176,7 +1176,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_79, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1186,7 +1186,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_80, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1196,7 +1196,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_81, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1206,7 +1206,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_82, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1216,7 +1216,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_83, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1226,7 +1226,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_84, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1236,7 +1236,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_85, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1246,7 +1246,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_86, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1256,7 +1256,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_87, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1266,7 +1266,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_88, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1276,7 +1276,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_89, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1286,7 +1286,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_90, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1296,7 +1296,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_91, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1306,7 +1306,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_92, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1316,7 +1316,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_93, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1326,7 +1326,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_94, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1336,7 +1336,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_95, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1346,7 +1346,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_96, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1356,7 +1356,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_97, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1366,7 +1366,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_98, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1376,7 +1376,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_99, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1386,7 +1386,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_100, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1396,7 +1396,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_101, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1406,7 +1406,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_102, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1416,7 +1416,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_103, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1426,7 +1426,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_104, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1436,7 +1436,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_105, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1446,7 +1446,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_106, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1456,7 +1456,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_107, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1466,7 +1466,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_108, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1476,7 +1476,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_109, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1486,7 +1486,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_110, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1496,7 +1496,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_111, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1506,7 +1506,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_112, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1516,7 +1516,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_113, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1526,7 +1526,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_114, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1536,7 +1536,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_115, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1546,7 +1546,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_116, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1556,7 +1556,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_117, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1566,7 +1566,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_118, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1576,7 +1576,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_119, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1586,7 +1586,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_120, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1596,7 +1596,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_121, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1606,7 +1606,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_122, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1616,7 +1616,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_123, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1626,7 +1626,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_124, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1636,7 +1636,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_125, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1646,7 +1646,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_126, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1656,7 +1656,7 @@ uObjTxtr timesnewroman_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) ×newroman_tex_127, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ diff --git a/src/s2d_engine/fonts/ubuntu.c b/src/s2d_engine/fonts/ubuntu.c index f46fc7b0..d3b7d24f 100644 --- a/src/s2d_engine/fonts/ubuntu.c +++ b/src/s2d_engine/fonts/ubuntu.c @@ -386,7 +386,7 @@ Gfx ubuntu_align_127[] = {gsSPEndDisplayList()}; uObjTxtr ubuntu_tex[] = { { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_0, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -396,7 +396,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_1, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -406,7 +406,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_2, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -416,7 +416,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_3, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -426,7 +426,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_4, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -436,7 +436,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_5, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -446,7 +446,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_6, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -456,7 +456,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_7, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -466,7 +466,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_8, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -476,7 +476,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_9, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -486,7 +486,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_10, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -496,7 +496,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_11, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -506,7 +506,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_12, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -516,7 +516,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_13, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -526,7 +526,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_14, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -536,7 +536,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_15, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -546,7 +546,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_16, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -556,7 +556,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_17, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -566,7 +566,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_18, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -576,7 +576,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_19, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -586,7 +586,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_20, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -596,7 +596,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_21, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -606,7 +606,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_22, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -616,7 +616,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_23, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -626,7 +626,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_24, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -636,7 +636,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_25, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -646,7 +646,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_26, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -656,7 +656,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_27, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -666,7 +666,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_28, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -676,7 +676,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_29, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -686,7 +686,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_30, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -696,7 +696,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_31, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -706,7 +706,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_32, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -716,7 +716,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_33, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -726,7 +726,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_34, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -736,7 +736,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_35, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -746,7 +746,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_36, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -756,7 +756,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_37, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -766,7 +766,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_38, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -776,7 +776,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_39, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -786,7 +786,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_40, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -796,7 +796,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_41, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -806,7 +806,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_42, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -816,7 +816,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_43, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -826,7 +826,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_44, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -836,7 +836,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_45, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -846,7 +846,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_46, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -856,7 +856,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_47, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -866,7 +866,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_48, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -876,7 +876,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_49, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -886,7 +886,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_50, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -896,7 +896,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_51, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -906,7 +906,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_52, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -916,7 +916,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_53, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -926,7 +926,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_54, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -936,7 +936,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_55, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -946,7 +946,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_56, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -956,7 +956,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_57, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -966,7 +966,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_58, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -976,7 +976,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_59, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -986,7 +986,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_60, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -996,7 +996,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_61, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1006,7 +1006,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_62, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1016,7 +1016,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_63, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1026,7 +1026,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_64, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1036,7 +1036,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_65, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1046,7 +1046,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_66, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1056,7 +1056,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_67, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1066,7 +1066,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_68, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1076,7 +1076,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_69, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1086,7 +1086,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_70, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1096,7 +1096,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_71, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1106,7 +1106,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_72, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1116,7 +1116,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_73, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1126,7 +1126,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_74, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1136,7 +1136,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_75, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1146,7 +1146,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_76, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1156,7 +1156,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_77, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1166,7 +1166,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_78, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1176,7 +1176,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_79, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1186,7 +1186,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_80, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1196,7 +1196,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_81, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1206,7 +1206,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_82, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1216,7 +1216,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_83, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1226,7 +1226,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_84, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1236,7 +1236,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_85, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1246,7 +1246,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_86, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1256,7 +1256,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_87, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1266,7 +1266,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_88, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1276,7 +1276,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_89, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1286,7 +1286,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_90, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1296,7 +1296,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_91, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1306,7 +1306,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_92, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1316,7 +1316,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_93, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1326,7 +1326,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_94, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1336,7 +1336,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_95, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1346,7 +1346,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_96, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1356,7 +1356,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_97, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1366,7 +1366,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_98, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1376,7 +1376,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_99, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1386,7 +1386,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_100, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1396,7 +1396,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_101, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1406,7 +1406,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_102, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1416,7 +1416,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_103, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1426,7 +1426,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_104, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1436,7 +1436,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_105, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1446,7 +1446,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_106, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1456,7 +1456,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_107, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1466,7 +1466,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_108, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1476,7 +1476,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_109, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1486,7 +1486,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_110, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1496,7 +1496,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_111, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1506,7 +1506,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_112, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1516,7 +1516,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_113, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1526,7 +1526,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_114, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1536,7 +1536,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_115, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1546,7 +1546,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_116, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1556,7 +1556,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_117, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1566,7 +1566,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_118, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1576,7 +1576,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_119, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1586,7 +1586,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_120, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1596,7 +1596,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_121, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1606,7 +1606,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_122, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1616,7 +1616,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_123, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1626,7 +1626,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_124, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1636,7 +1636,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_125, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1646,7 +1646,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_126, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ @@ -1656,7 +1656,7 @@ uObjTxtr ubuntu_tex[] = { 0xFFFFFFFF, /* mask */ }, { - G_OBJLT_TXTRBLOCK, + G_OBJLT_TXTRBLOCK, (u64 *) &ubuntu_tex_127, /* image */ GS_PIX2TMEM(0, G_IM_SIZ_8b), /* tmem */ GS_TB_TSIZE(64*64, G_IM_SIZ_8b), /* tsize */ diff --git a/src/s2d_engine/x86_testing_ground/atoi.c b/src/s2d_engine/x86_testing_ground/atoi.c index 16b33717..e1dc498a 100644 --- a/src/s2d_engine/x86_testing_ground/atoi.c +++ b/src/s2d_engine/x86_testing_ground/atoi.c @@ -91,10 +91,10 @@ void s2d_print(int x, int y, char *str) { // s2d_blue = s2d_atoi(p, &p); // CH_SKIP(p); CH_SKIP(p); - + // s2d_alpha = s2d_atoi(p, &p); // break; - + // break; default: break; @@ -197,12 +197,12 @@ int main(void) { // s2d_print(0,0, t); char laStrBuf[0x100]; char ff[0x100]; - sprintf(ff, + sprintf(ff, "%s %d:" TRANSLATE "134 93" "%s:" , "Floor", 213, "Seed"); sprintf( - laStrBuf, + laStrBuf, "%s" TRANSLATE "138 93" "%s" TRANSLATE "138 110" "%s" diff --git a/src/usb/debug.c b/src/usb/debug.c index e6bd4e94..47ce46bd 100644 --- a/src/usb/debug.c +++ b/src/usb/debug.c @@ -1,13 +1,13 @@ /*************************************************************** debug.c - + A basic debug library that makes use of the USB library for N64 -flashcarts. +flashcarts. https://github.com/buu342/N64-UNFLoader ***************************************************************/ #include "debug.h" #ifndef LIBDRAGON - #include + #include #include // Needed for Crash's Linux toolchain #else #include @@ -20,36 +20,36 @@ https://github.com/buu342/N64-UNFLoader #if DEBUG_MODE - + /********************************* Definitions *********************************/ - + #define MSG_FAULT 0x10 #define MSG_READ 0x11 #define MSG_WRITE 0x12 - + #define USBERROR_NONE 0 #define USBERROR_NOTTEXT 1 #define USBERROR_UNKNOWN 2 #define USBERROR_TOOMUCH 3 #define USBERROR_CUSTOM 4 - + #define HASHTABLE_SIZE 7 #define COMMAND_TOKENS 10 #define BUFFER_SIZE 256 - + /********************************* Libultra types (for libdragon) *********************************/ #ifdef LIBDRAGON - typedef unsigned char u8; + typedef unsigned char u8; typedef unsigned short u16; typedef unsigned long u32; typedef unsigned long long u64; - typedef signed char s8; + typedef signed char s8; typedef short s16; typedef long s32; typedef long long s64; @@ -67,42 +67,42 @@ https://github.com/buu342/N64-UNFLoader typedef float f32; typedef double f64; #endif - + /********************************* Structs *********************************/ // Register struct - typedef struct + typedef struct { u32 mask; u32 value; char *string; } regDesc; - + // Thread message struct - typedef struct + typedef struct { int msgtype; int datatype; void* buff; int size; } usbMesg; - + // Debug command struct - typedef struct + typedef struct { char* command; char* description; char* (*execute)(); void* next; } debugCommand; - - + + /********************************* Function Prototypes *********************************/ - + #ifndef LIBDRAGON // Threads #if USE_FAULTTHREAD @@ -117,8 +117,8 @@ https://github.com/buu342/N64-UNFLoader #else static void debug_thread_usb(void *arg); #endif - - + + /********************************* Globals *********************************/ @@ -134,12 +134,12 @@ https://github.com/buu342/N64-UNFLoader // Debug globals static char debug_initialized = 0; static char debug_buffer[BUFFER_SIZE]; - + // Commands hashtable related static debugCommand* debug_commands_hashtable[HASHTABLE_SIZE]; static debugCommand debug_commands_elements[MAX_COMMANDS]; static int debug_commands_count = 0; - + // Command parsing related static int debug_command_current = 0; static int debug_command_totaltokens = 0; @@ -160,7 +160,7 @@ https://github.com/buu342/N64-UNFLoader static OSThread faultThread; static u64 faultThreadStack[FAULT_THREAD_STACK/sizeof(u64)]; #endif - + // USB thread globals static OSMesgQueue usbMessageQ; static OSMesg usbMessageBuf; @@ -265,47 +265,47 @@ https://github.com/buu342/N64-UNFLoader /********************************* Debug functions *********************************/ - + /*============================== debug_initialize Initializes the debug library ==============================*/ - + void debug_initialize() { // Initialize the USB functions if (!usb_initialize()) return; - + // Overwrite osSyncPrintf #ifndef LIBDRAGON #if OVERWRITE_OSPRINT __printfunc = (void*)debug_osSyncPrintf_implementation; #endif - + // Initialize the fault thread #if USE_FAULTTHREAD - osCreateThread(&faultThread, FAULT_THREAD_ID, debug_thread_fault, 0, - (faultThreadStack+FAULT_THREAD_STACK/sizeof(u64)), + osCreateThread(&faultThread, FAULT_THREAD_ID, debug_thread_fault, 0, + (faultThreadStack+FAULT_THREAD_STACK/sizeof(u64)), FAULT_THREAD_PRI); osStartThread(&faultThread); #endif - + // Initialize the USB thread - osCreateThread(&usbThread, USB_THREAD_ID, debug_thread_usb, 0, - (usbThreadStack+USB_THREAD_STACK/sizeof(u64)), + osCreateThread(&usbThread, USB_THREAD_ID, debug_thread_usb, 0, + (usbThreadStack+USB_THREAD_STACK/sizeof(u64)), USB_THREAD_PRI); osStartThread(&usbThread); #endif - + // Mark the debug mode as initialized debug_initialized = 1; #if DEBUG_INIT_MSG debug_printf("Debug mode initialized!\n\n"); #endif } - - + + #ifndef LIBDRAGON /*============================== printf_handler @@ -315,14 +315,14 @@ https://github.com/buu342/N64-UNFLoader @param The length of the string @returns The end of the buffer that was written to ==============================*/ - + static void* printf_handler(void *buf, const char *str, size_t len) { return ((char *) memcpy(buf, str, len) + len); } #endif - - + + /*============================== debug_printf Prints a formatted message to the developer's command prompt. @@ -330,13 +330,13 @@ https://github.com/buu342/N64-UNFLoader @param A string to print @param variadic arguments to print as well ==============================*/ - + void debug_printf(const char* message, ...) { int len = 0; usbMesg msg; va_list args; - + // use the internal libultra printf function to format the string va_start(args, message); #ifndef LIBDRAGON @@ -345,11 +345,11 @@ https://github.com/buu342/N64-UNFLoader len = vsprintf(debug_buffer, message, args); #endif va_end(args); - + // Attach the '\0' if necessary if (0 <= len) debug_buffer[len] = '\0'; - + // Send the printf to the usb thread msg.msgtype = MSG_WRITE; msg.datatype = DATATYPE_TEXT; @@ -361,19 +361,19 @@ https://github.com/buu342/N64-UNFLoader debug_thread_usb(&msg); #endif } - - + + /*============================== debug_dumpbinary Dumps a binary file through USB @param The file to dump @param The size of the file ==============================*/ - + void debug_dumpbinary(void* file, int size) { usbMesg msg; - + // Send the binary file to the usb thread msg.msgtype = MSG_WRITE; msg.datatype = DATATYPE_RAWBINARY; @@ -385,27 +385,27 @@ https://github.com/buu342/N64-UNFLoader debug_thread_usb(&msg); #endif } - - + + /*============================== debug_screenshot Sends the currently displayed framebuffer through USB. DOES NOT PAUSE DRAWING THREAD! Using outside the drawing thread may lead to a screenshot with visible tearing ==============================*/ - + void debug_screenshot() { usbMesg msg; int data[4]; - + // These addresses were obtained from http://en64.shoutwiki.com/wiki/VI_Registers_Detailed void* frame = (void*)(0x80000000|(*(u32*)0xA4400004)); // Same as calling osViGetCurrentFramebuffer() in libultra u32 yscale = (*(u32*)0xA4400034); u32 w = (*(u32*)0xA4400008); u32 h = ((((*(u32*)0xA4400028)&0x3FF)-(((*(u32*)0xA4400028)>>16)&0x3FF))*yscale)/2048; u8 depth = (((*(u32*)0xA4400000)&0x03) == 0x03) ? 4 : 2; - + // Ensure debug mode is initialized if (!debug_initialized) return; @@ -415,7 +415,7 @@ https://github.com/buu342/N64-UNFLoader data[1] = depth; data[2] = w; data[3] = h; - + // Send the header to the USB thread msg.msgtype = MSG_WRITE; msg.datatype = DATATYPE_HEADER; @@ -453,12 +453,12 @@ https://github.com/buu342/N64-UNFLoader #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-but-set-variable" volatile char crash; - + // Set the assert data assert_expr = expression; assert_line = line; assert_file = file; - + // If on libdragon, print where the assertion failed #ifdef LIBDRAGON debug_printf("Assertion failed in file '%s', line %d.\n", assert_file, assert_line); @@ -468,8 +468,8 @@ https://github.com/buu342/N64-UNFLoader crash = *(volatile char *)1; #pragma GCC diagnostic pop } - - + + /*============================== debug_addcommand Adds a command for the USB to listen for @@ -477,23 +477,23 @@ https://github.com/buu342/N64-UNFLoader @param The command description @param The function pointer to execute ==============================*/ - + void debug_addcommand(char* command, char* description, char* (*execute)()) { int entry = command[0]%HASHTABLE_SIZE; debugCommand* slot = debug_commands_hashtable[entry]; - + // Ensure debug mode is initialized if (!debug_initialized) return; - + // Ensure we haven't hit the command limit if (debug_commands_count == MAX_COMMANDS) { debug_printf("Max commands exceeded!\n"); return; } - + // Look for an empty spot in the hash table if (slot != NULL) { @@ -503,53 +503,53 @@ https://github.com/buu342/N64-UNFLoader } else debug_commands_hashtable[entry] = &debug_commands_elements[debug_commands_count]; - + // Fill this spot with info about this command debug_commands_elements[debug_commands_count].command = command; debug_commands_elements[debug_commands_count].description = description; debug_commands_elements[debug_commands_count].execute = execute; debug_commands_count++; } - - + + /*============================== debug_printcommands Prints a list of commands to the developer's command prompt. ==============================*/ - + void debug_printcommands() { int i; - + // Ensure debug mode is initialized if (!debug_initialized) return; - + // Ensure there are commands to print if (debug_commands_count == 0) return; - + // Print the commands debug_printf("Available USB commands\n----------------------\n"); for (i=0; i 0) { int readsize = BUFFER_SIZE; if (readsize > dataleft) readsize = dataleft; - + // Read a block from USB memset(debug_buffer, 0, BUFFER_SIZE); usb_read(debug_buffer, readsize); @@ -642,7 +642,7 @@ https://github.com/buu342/N64-UNFLoader // If we're not reading a file int offset = datasize-dataleft; u8 tok = debug_command_totaltokens; - + // Decide what to do based on the current character switch (debug_buffer[i]) { @@ -655,7 +655,7 @@ https://github.com/buu342/N64-UNFLoader debug_command_incoming_size[tok] = offset-debug_command_incoming_start[tok]; debug_command_totaltokens++; } - + if (debug_buffer[i] == '\0') dataleft = 0; break; @@ -668,7 +668,7 @@ https://github.com/buu342/N64-UNFLoader // Decide what to do based on the file handle if (filestep == 0 && debug_command_incoming_start[tok] == -1) { - // Store the data offsets and sizes in the global command buffers + // Store the data offsets and sizes in the global command buffers debug_command_incoming_start[tok] = offset; } else if (filestep == 1) @@ -678,11 +678,11 @@ https://github.com/buu342/N64-UNFLoader } else if (filestep > 1) { - // Store the file offsets and sizes in the global command buffers + // Store the file offsets and sizes in the global command buffers debug_command_incoming_start[tok] = offset; debug_command_incoming_size[tok] = filesize; debug_command_totaltokens++; - + // Skip a bunch of bytes if ((readsize-i)-filesize < 0) usb_skip(filesize-(readsize-i)); @@ -696,12 +696,12 @@ https://github.com/buu342/N64-UNFLoader dataleft--; } } - + // Rewind the USB fully usb_rewind(datasize); } - - + + /*============================== debug_thread_usb Handles the USB thread @@ -728,13 +728,13 @@ https://github.com/buu342/N64-UNFLoader // Wait for a USB message to arrive osRecvMesg(&usbMessageQ, (OSMesg *)&threadMsg, OS_MESG_BLOCK); #endif - + // Ensure there's no data in the USB (which handles MSG_READ) while (usb_poll() != 0) { int header = usb_poll(); debugCommand* entry; - + // Ensure we're receiving a text command if (USBHEADER_GETTYPE(header) != DATATYPE_TEXT) { @@ -742,14 +742,14 @@ https://github.com/buu342/N64-UNFLoader usb_purge(); break; } - + // Initialize the command trackers debug_command_totaltokens = 0; debug_command_current = 0; - + // Break the USB command into parts debug_commands_setup(); - + // Ensure we don't read past our buffer if (debug_sizecommand() > BUFFER_SIZE) { @@ -757,17 +757,17 @@ https://github.com/buu342/N64-UNFLoader usb_purge(); break; } - + // Read from the USB to retrieve the command name debug_parsecommand(debug_buffer); - + // Iterate through the hashtable to see if we find the command entry = debug_commands_hashtable[debug_buffer[0]%HASHTABLE_SIZE]; while (entry != NULL) { // If we found the command if (!strncmp(debug_buffer, entry->command, debug_command_incoming_size[0])) - { + { // Execute the command function and exit the while loop debug_command_error = entry->execute(); if (debug_command_error != NULL) @@ -777,7 +777,7 @@ https://github.com/buu342/N64-UNFLoader } entry = entry->next; } - + // If no command was found if (entry == NULL) { @@ -786,7 +786,7 @@ https://github.com/buu342/N64-UNFLoader errortype = USBERROR_UNKNOWN; } } - + // Spit out an error if there was one during the command parsing if (errortype != USBERROR_NONE) { @@ -808,7 +808,7 @@ https://github.com/buu342/N64-UNFLoader } errortype = USBERROR_NONE; } - + // Handle the other USB messages switch (threadMsg->msgtype) { @@ -823,10 +823,10 @@ https://github.com/buu342/N64-UNFLoader #endif } } - + #ifndef LIBDRAGON #if OVERWRITE_OSPRINT - + /*============================== debug_osSyncPrintf_implementation Overwrites osSyncPrintf calls with this one @@ -835,31 +835,31 @@ https://github.com/buu342/N64-UNFLoader @param The amount of characters to write @returns The end of the buffer that was written to ==============================*/ - + static void* debug_osSyncPrintf_implementation(void *unused, const char *str, size_t len) { void* ret; usbMesg msg; - + // Clear the debug buffer and copy the formatted string to it memset(debug_buffer, 0, len+1); ret = ((char *) memcpy(debug_buffer, str, len) + len); - + // Send the printf to the usb thread msg.msgtype = MSG_WRITE; msg.datatype = DATATYPE_TEXT; msg.buff = debug_buffer; msg.size = len+1; osSendMesg(&usbMessageQ, (OSMesg)&msg, OS_MESG_BLOCK); - + // Return the end of the buffer return ret; } - - #endif + + #endif #if USE_FAULTTHREAD - + /*============================== debug_printreg Prints info about a register @@ -872,9 +872,9 @@ https://github.com/buu342/N64-UNFLoader { char first = 1; debug_printf("%s\t\t0x%08x <", name, value); - while (desc->mask != 0) + while (desc->mask != 0) { - if ((value & desc->mask) == desc->value) + if ((value & desc->mask) == desc->value) { (first) ? (first = 0) : ((void)debug_printf(",")); debug_printf("%s", desc->string); @@ -883,14 +883,14 @@ https://github.com/buu342/N64-UNFLoader } debug_printf(">\n"); } - - + + /*============================== debug_thread_fault Handles the fault thread @param Arbitrary data that the thread can receive ==============================*/ - + static void debug_thread_fault(void *arg) { OSMesg msg; @@ -905,10 +905,10 @@ https://github.com/buu342/N64-UNFLoader { // Wait for a fault message to arrive osRecvMesg(&faultMessageQ, (OSMesg *)&msg, OS_MESG_BLOCK); - + // Get the faulted thread curr = (OSThread *)__osGetCurrFaultedThread(); - if (curr != NULL) + if (curr != NULL) { __OSThreadContext* context = &curr->context; @@ -921,7 +921,7 @@ https://github.com/buu342/N64-UNFLoader debug_printf("cause\t\tAssertion failed in file '%s', line %d.\n", assert_file, assert_line); debug_printreg(context->sr, "sr", srDesc); debug_printf("badvaddr\t0x%08x\n\n", context->badvaddr); - + // Print the registers debug_printf("at 0x%016llx v0 0x%016llx v1 0x%016llx\n", context->at, context->v0, context->v1); debug_printf("a0 0x%016llx a1 0x%016llx a2 0x%016llx\n", context->a0, context->a1, context->a2); @@ -948,8 +948,8 @@ https://github.com/buu342/N64-UNFLoader } } } - + #endif #endif - + #endif \ No newline at end of file diff --git a/src/usb/debug.h b/src/usb/debug.h index ebe7ea69..d9c2f583 100644 --- a/src/usb/debug.h +++ b/src/usb/debug.h @@ -11,32 +11,32 @@ #define USE_FAULTTHREAD 1 // Create a fault detection thread (libultra only) #define OVERWRITE_OSPRINT 1 // Replaces osSyncPrintf calls with debug_printf (libultra only) #define MAX_COMMANDS 25 // The max amount of user defined commands possible - + // Fault thread definitions (libultra only) #define FAULT_THREAD_ID 13 #define FAULT_THREAD_PRI 125 #define FAULT_THREAD_STACK 0x2000 - + // USB thread definitions (libultra only) #define USB_THREAD_ID 14 #define USB_THREAD_PRI 126 #define USB_THREAD_STACK 0x2000 - - + + /********************************* Debug Functions *********************************/ - + #if DEBUG_MODE - + /*============================== debug_initialize Initializes the debug and USB library. ==============================*/ - + extern void debug_initialize(); - - + + /*============================== debug_printf Prints a formatted message to the developer's command prompt. @@ -44,58 +44,58 @@ @param A string to print @param variadic arguments to print as well ==============================*/ - + extern void debug_printf(const char* message, ...); - - + + /*============================== debug_dumpbinary Dumps a binary file through USB @param The file to dump @param The size of the file ==============================*/ - + extern void debug_dumpbinary(void* file, int size); - - + + /*============================== debug_screenshot Sends the currently displayed framebuffer through USB. DOES NOT PAUSE DRAWING THREAD! Using outside the drawing thread may lead to a screenshot with visible tearing ==============================*/ - + extern void debug_screenshot(); - - + + /*============================== debug_assert Halts the program if the expression fails. @param The expression to test ==============================*/ - + #define debug_assert(expr) (expr) ? ((void)0) : _debug_assert(#expr, __FILE__, __LINE__) - - + + /*============================== debug_pollcommands Check the USB for incoming commands. ==============================*/ - + extern void debug_pollcommands(); - - + + /*============================== debug_addcommand Adds a command for the USB to read. @param The command name @param The command description - @param The function pointer to execute + @param The function pointer to execute ==============================*/ - + extern void debug_addcommand(char* command, char* description, char*(*execute)()); - + /*============================== debug_parsecommand Stores the next part of the incoming command into the provided buffer. @@ -103,38 +103,38 @@ If you pass NULL, it skips this command. @param The buffer to store the data in ==============================*/ - + extern void debug_parsecommand(void* buffer); - - + + /*============================== debug_sizecommand Returns the size of the data from this part of the command. @return The size of the data in bytes, or 0 ==============================*/ - + extern int debug_sizecommand(); - - + + /*============================== debug_printcommands Prints a list of commands to the developer's command prompt. ==============================*/ - + extern void debug_printcommands(); - + // Ignore this, use the macro instead extern void _debug_assert(const char* expression, const char* file, int line); - + // Include usb.h automatically #include "usb.h" - + #else - + // Overwrite library functions with useless macros if debug mode is disabled - #define debug_initialize() - #define debug_printf(__VA_ARGS__) + #define debug_initialize() + #define debug_printf(__VA_ARGS__) #define debug_screenshot(a, b, c) #define debug_assert(a) #define debug_pollcommands() @@ -150,7 +150,7 @@ #define usb_skip(a) #define usb_rewind(a) #define usb_purge() - + #endif - + #endif \ No newline at end of file diff --git a/src/usb/usb.c b/src/usb/usb.c index 46f56cf9..11297b9a 100644 --- a/src/usb/usb.c +++ b/src/usb/usb.c @@ -1,6 +1,6 @@ /*************************************************************** usb.c - + Allows USB communication between an N64 flashcart and the PC using UNFLoader. https://github.com/buu342/N64-UNFLoader @@ -91,7 +91,7 @@ https://github.com/buu342/N64-UNFLoader 64Drive macros *********************************/ -// How many cycles for the 64Drive to wait for data. +// How many cycles for the 64Drive to wait for data. // Lowering this might improve performance slightly faster at the expense of USB reading accuracy #define D64_POLLTIME 2000 @@ -206,12 +206,12 @@ https://github.com/buu342/N64-UNFLoader *********************************/ #ifdef LIBDRAGON - typedef uint8_t u8; + typedef uint8_t u8; typedef uint16_t u16; typedef uint32_t u32; typedef uint64_t u64; - typedef int8_t s8; + typedef int8_t s8; typedef int16_t s16; typedef int32_t s32; typedef int64_t s64; @@ -279,7 +279,7 @@ int usb_readblock = -1; extern s32 __osPiRawWriteIo(u32, u32); extern s32 __osPiRawReadIo(u32, u32 *); extern s32 __osPiRawStartDma(s32, u32, void *, u32); - + #define osPiRawWriteIo(a, b) __osPiRawWriteIo(a, b) #define osPiRawReadIo(a, b) __osPiRawReadIo(a, b) #define osPiRawStartDma(a, b, c, d) __osPiRawStartDma(a, b, c, d) @@ -301,14 +301,14 @@ char usb_initialize() { // Initialize the debug related globals memset(usb_buffer, 0, BUFFER_SIZE); - + #ifndef LIBDRAGON // Create the message queue #if !USE_OSRAW osCreateMesgQueue(&dmaMessageQ, &dmaMessageBuf, 1); #endif #endif - + // Find the flashcart usb_findcart(); @@ -345,7 +345,7 @@ char usb_initialize() static void usb_findcart() { u32 buff __attribute__((aligned(8))); - + // Read the cartridge and check if we have a 64Drive. #ifdef LIBDRAGON buff = io_read(D64_CIBASE_ADDRESS + D64_REGISTER_MAGIC); @@ -377,19 +377,19 @@ static void usb_findcart() usb_cart = CART_SC64; return; } - + // Since we didn't find a 64Drive or SummerCart64, let's assume we have an EverDrive // Write the key to unlock the registers, then read the version register usb_everdrive_writereg(ED_REG_KEY, ED_REGKEY); usb_everdrive_readreg(ED_REG_VERSION, &buff); - + // Check if we have an EverDrive if (buff == ED7_VERSION || buff == ED3_VERSION) { // Set the USB mode usb_everdrive_writereg(ED_REG_SYSCFG, 0); usb_everdrive_writereg(ED_REG_USBCFG, ED_USBMODE_RDNOP); - + // Set the cart to EverDrive usb_cart = CART_EVERDRIVE; return; @@ -423,11 +423,11 @@ void usb_write(int datatype, const void* data, int size) // If no debug cart exists, stop if (usb_cart == CART_NONE) return; - + // If there's data to read first, stop if (usb_dataleft != 0) return; - + // Call the correct write function funcPointer_write(datatype, data, size); } @@ -445,7 +445,7 @@ unsigned long usb_poll() // If no debug cart exists, stop if (usb_cart == CART_NONE) return 0; - + // If we're out of USB data to read, we don't need the header info anymore if (usb_dataleft <= 0) { @@ -454,11 +454,11 @@ unsigned long usb_poll() usb_datasize = 0; usb_readblock = -1; } - + // If there's still data that needs to be read, return the header with the data left if (usb_dataleft != 0) return USBHEADER_CREATE(usb_datatype, usb_dataleft); - + // Call the correct read function return funcPointer_poll(); } @@ -479,11 +479,11 @@ void usb_read(void* buffer, int nbytes) int copystart = offset%BUFFER_SIZE; int block = BUFFER_SIZE-copystart; int blockoffset = (offset/BUFFER_SIZE)*BUFFER_SIZE; - + // If no debug cart exists, stop if (usb_cart == CART_NONE) return; - + // If there's no data to read, stop if (usb_dataleft == 0) return; @@ -496,17 +496,17 @@ void usb_read(void* buffer, int nbytes) left = usb_dataleft; if (block > left) block = left; - + // Call the read function if we're reading a new block if (usb_readblock != blockoffset) { usb_readblock = blockoffset; funcPointer_read(); } - + // Copy from the USB buffer to the supplied buffer memcpy(buffer+read, usb_buffer+copystart, block); - + // Increment/decrement all our counters read += block; left -= block; @@ -576,7 +576,7 @@ static s8 usb_64drive_wait() { u32 ret __attribute__((aligned(8))); u32 timeout = 0; // I wanted to use osGetTime() but that requires the VI manager - + // Wait until the cartridge interface is ready do { @@ -589,14 +589,14 @@ static s8 usb_64drive_wait() osPiReadIo(D64_CIBASE_ADDRESS + D64_REGISTER_STATUS, &ret); #endif #endif - + // Took too long, abort if((timeout++) > 10000) return -1; } while((ret >> 8) & D64_CI_BUSY); (void) timeout; // Needed to stop unused variable warning - + // Success return 0; } @@ -633,7 +633,7 @@ static int usb_64drive_waitidle() { u32 status __attribute__((aligned(8))); u32 timeout = 0; - do + do { #ifdef LIBDRAGON status = io_read(D64_CIBASE_ADDRESS + D64_REGISTER_USBCOMSTAT); @@ -713,19 +713,19 @@ static void usb_64drive_write(int datatype, const void* data, int size) { int left = size; int read = 0; - + // Spin until the write buffer is free and then set the cartridge to write mode if (!usb_64drive_waitidle()) return; usb_64drive_setwritable(TRUE); - + // Write data to SDRAM until we've finished while (left > 0) { int block = left; if (block > BUFFER_SIZE) block = BUFFER_SIZE; - + // Copy the data to the global buffer memcpy(usb_buffer, (void*)((char*)data+read), block); @@ -735,18 +735,18 @@ static void usb_64drive_write(int datatype, const void* data, int size) u32 i; u32 size_new = (size & ~3)+4; block += size_new-size; - for (i=size; i> 1); @@ -785,7 +785,7 @@ static void usb_64drive_write(int datatype, const void* data, int size) osPiWriteIo(D64_CIBASE_ADDRESS + D64_REGISTER_USBCOMSTAT, D64_COMMAND_WRITE); #endif #endif - + // Spin until the write buffer is free and then disable write mode usb_64drive_waitidle(); usb_64drive_setwritable(FALSE); @@ -803,11 +803,11 @@ static void usb_64drive_arm(u32 offset, u32 size) { u32 ret __attribute__((aligned(8))); ret = usb_64drive_armstatus(); - + if (ret != D64_USB_ARMING && ret != D64_USB_ARMED) { usb_64drive_waitidle(); - + // Arm the 64Drive, using the ROM space as a buffer #ifdef LIBDRAGON io_write(D64_CIBASE_ADDRESS + D64_REGISTER_USBCOMSTAT, D64_USB_ARM); @@ -840,9 +840,9 @@ static void usb_64drive_disarm() io_write(D64_CIBASE_ADDRESS + D64_REGISTER_USBCOMSTAT, D64_USB_DISARM); #else #if USE_OSRAW - osPiRawWriteIo(D64_CIBASE_ADDRESS + D64_REGISTER_USBCOMSTAT, D64_USB_DISARM); + osPiRawWriteIo(D64_CIBASE_ADDRESS + D64_REGISTER_USBCOMSTAT, D64_USB_DISARM); #else - osPiWriteIo(D64_CIBASE_ADDRESS + D64_REGISTER_USBCOMSTAT, D64_USB_DISARM); + osPiWriteIo(D64_CIBASE_ADDRESS + D64_REGISTER_USBCOMSTAT, D64_USB_DISARM); #endif #endif usb_64drive_waitdisarmed(); @@ -860,16 +860,16 @@ static u32 usb_64drive_poll() { int i; u32 ret __attribute__((aligned(8))); - + // Arm the USB buffer usb_64drive_waitidle(); usb_64drive_setwritable(TRUE); usb_64drive_arm(DEBUG_ADDRESS, DEBUG_ADDRESS_SIZE); - + // Burn some time to see if any USB data comes in for (i=0; i size) block = size; addr = BUFFER_SIZE - block; - + // Request to read from the USB - usb_everdrive_writereg(ED_REG_USBCFG, ED_USBMODE_RD | addr); + usb_everdrive_writereg(ED_REG_USBCFG, ED_USBMODE_RD | addr); // Wait for the FPGA to transfer the data to its internal buffer - usb_everdrive_usbbusy(); + usb_everdrive_usbbusy(); // Read from the internal buffer and store it in our buffer - usb_everdrive_readdata(buffer, ED_GET_REGADD(ED_REG_USBDAT + addr), block); + usb_everdrive_readdata(buffer, ED_GET_REGADD(ED_REG_USBDAT + addr), block); buffer = (char*)buffer + block; size -= block; } @@ -1150,7 +1150,7 @@ static void usb_everdrive_write(int datatype, const void* data, int size) int left = size; int offset = 8; u32 header = (size & 0x00FFFFFF) | (datatype << 24); - + // Put in the DMA header along with length and type information in the global buffer usb_buffer[0] = 'D'; usb_buffer[1] = 'M'; @@ -1160,7 +1160,7 @@ static void usb_everdrive_write(int datatype, const void* data, int size) usb_buffer[5] = (header >> 16) & 0xFF; usb_buffer[6] = (header >> 8) & 0xFF; usb_buffer[7] = header & 0xFF; - + // Write data to USB until we've finished while (left > 0) { @@ -1168,10 +1168,10 @@ static void usb_everdrive_write(int datatype, const void* data, int size) int blocksend, baddr; if (block+offset > BUFFER_SIZE) block = BUFFER_SIZE-offset; - + // Copy the data to the next available spots in the global buffer memcpy(usb_buffer+offset, (void*)((char*)data+read), block); - + // Restart the loop to write the CMP signal if we've finished if (!wrotecmp && read+block >= size) { @@ -1182,7 +1182,7 @@ static void usb_everdrive_write(int datatype, const void* data, int size) read = 0; continue; } - + // Ensure the data is 16 byte aligned and the block address is correct blocksend = (block+offset)+15 - ((block+offset)+15)%16; baddr = BUFFER_SIZE - blocksend; @@ -1190,11 +1190,11 @@ static void usb_everdrive_write(int datatype, const void* data, int size) // Set USB to write mode and send data through USB usb_everdrive_writereg(ED_REG_USBCFG, ED_USBMODE_WRNOP); usb_everdrive_writedata(usb_buffer, ED_GET_REGADD(ED_REG_USBDAT + baddr), blocksend); - + // Set USB to write mode with the new address and wait for USB to end usb_everdrive_writereg(ED_REG_USBCFG, ED_USBMODE_WR | baddr); usb_everdrive_usbbusy(); - + // Keep track of what we've read so far left -= block; read += block; @@ -1215,45 +1215,45 @@ static u32 usb_everdrive_poll() char buff[16] __attribute__((aligned(8))); int len; int offset = 0; - + // Wait for the USB to be ready usb_everdrive_usbbusy(); - + // Check if the USB is ready to be read if (!usb_everdrive_canread()) return 0; - + // Read the first 8 bytes that are being received and check if they're valid usb_everdrive_readusb(buff, 16); if (buff[0] != 'D' || buff[1] != 'M' || buff[2] != 'A' || buff[3] != '@') return 0; - + // Store information about the incoming data usb_datatype = (int)buff[4]; usb_datasize = (int)buff[5]<<16 | (int)buff[6]<<8 | (int)buff[7]<<0; usb_dataleft = usb_datasize; usb_readblock = -1; - + // Begin receiving data usb_everdrive_writereg(ED_REG_USBCFG, ED_USBMODE_RD | BUFFER_SIZE); len = (usb_datasize + BUFFER_SIZE-usb_datasize%BUFFER_SIZE)/BUFFER_SIZE; - + // While there's data to service - while (len--) + while (len--) { // Wait for the USB to be ready and then read data usb_everdrive_usbbusy(); usb_everdrive_readdata(usb_buffer, ED_GET_REGADD(ED_REG_USBDAT), BUFFER_SIZE); // TODO: Replace with usb_everdrive_readusb? - + // Tell the FPGA we can receive more data if (len != 0) usb_everdrive_writereg(ED_REG_USBCFG, ED_USBMODE_RD | BUFFER_SIZE); - + // Copy received block to ROM usb_everdrive_writedata(usb_buffer, ED_BASE + DEBUG_ADDRESS + offset, BUFFER_SIZE); offset += BUFFER_SIZE; } - + // Read the CMP Signal usb_everdrive_usbbusy(); usb_everdrive_readusb(buff, 16); @@ -1289,12 +1289,12 @@ static void usb_everdrive_read() #else osWritebackDCacheAll(); #if USE_OSRAW - osPiRawStartDma(OS_READ, - ED_BASE + DEBUG_ADDRESS + usb_readblock, usb_buffer, + osPiRawStartDma(OS_READ, + ED_BASE + DEBUG_ADDRESS + usb_readblock, usb_buffer, BUFFER_SIZE); #else - osPiStartDma(&dmaIOMessageBuf, OS_MESG_PRI_NORMAL, OS_READ, - ED_BASE + DEBUG_ADDRESS + usb_readblock, usb_buffer, + osPiStartDma(&dmaIOMessageBuf, OS_MESG_PRI_NORMAL, OS_READ, + ED_BASE + DEBUG_ADDRESS + usb_readblock, usb_buffer, BUFFER_SIZE, &dmaMessageQ); (void)osRecvMesg(&dmaMessageQ, NULL, OS_MESG_BLOCK); #endif @@ -1348,7 +1348,7 @@ static u32 usb_sc64_read_usb_fifo(void) osPiReadIo(SC64_MEM_USB_FIFO_BASE, &data); #endif #endif - + return data; } @@ -1577,7 +1577,7 @@ static u32 usb_sc64_poll(void) u32 buff __attribute__((aligned(8))); u32 sdram_address; int left; - + // Load how many 32 bit words are in FIFO u32 fifo_items = SC64_USB_FIFO_ITEMS(usb_sc64_read_usb_scr()); diff --git a/src/usb/usb.h b/src/usb/usb.h index 813b1b28..bcbe812b 100644 --- a/src/usb/usb.h +++ b/src/usb/usb.h @@ -1,43 +1,43 @@ #ifndef UNFL_USB_H #define UNFL_USB_H - + /********************************* DataType macros *********************************/ - + // UNCOMMENT THE #DEFINE IF USING LIBDRAGON - //#define LIBDRAGON + //#define LIBDRAGON // Settings #define USE_OSRAW 0 // Use if you're doing USB operations without the PI Manager (libultra only) #define DEBUG_ADDRESS_SIZE 8*1024*1024 // Max size of USB I/O. The bigger this value, the more ROM you lose! - + // Cart definitions #define CART_NONE 0 #define CART_64DRIVE 1 #define CART_EVERDRIVE 2 #define CART_SC64 3 - + // Data types defintions #define DATATYPE_TEXT 0x01 #define DATATYPE_RAWBINARY 0x02 #define DATATYPE_HEADER 0x03 #define DATATYPE_SCREENSHOT 0x04 - + extern int usb_datatype; extern int usb_datasize; extern int usb_dataleft; extern int usb_readblock; - + /********************************* Convenience macros *********************************/ - + // Use these to conveniently read the header from usb_poll() #define USBHEADER_GETTYPE(header) ((header & 0xFF000000) >> 24) #define USBHEADER_GETSIZE(header) ((header & 0x00FFFFFF)) - + /********************************* USB Functions @@ -48,19 +48,19 @@ Initializes the USB buffers and pointers @return 1 if the USB initialization was successful, 0 if not ==============================*/ - + extern char usb_initialize(); - - + + /*============================== usb_getcart Returns which flashcart is currently connected @return The CART macro that corresponds to the identified flashcart ==============================*/ - + extern char usb_getcart(); - - + + /*============================== usb_write Writes data to the USB. @@ -69,53 +69,53 @@ @param A buffer with the data to send @param The size of the data being sent ==============================*/ - + extern void usb_write(int datatype, const void* data, int size); - - + + /*============================== usb_poll Returns the header of data being received via USB The first byte contains the data type, the next 3 the number of bytes left to read @return The data header, or 0 ==============================*/ - + extern unsigned long usb_poll(); - - + + /*============================== usb_read Reads bytes from USB into the provided buffer @param The buffer to put the read data in @param The number of bytes to read ==============================*/ - + extern void usb_read(void* buffer, int size); - - + + /*============================== usb_skip Skips a USB read by the specified amount of bytes @param The number of bytes to skip ==============================*/ - + extern void usb_skip(int nbytes); - - + + /*============================== usb_rewind Rewinds a USB read by the specified amount of bytes @param The number of bytes to rewind ==============================*/ - + extern void usb_rewind(int nbytes); - - + + /*============================== usb_purge Purges the incoming USB data ==============================*/ - + extern void usb_purge(); #endif \ No newline at end of file diff --git a/tools/clang-tidy.sh b/tools/clang-tidy.sh index 22481433..088b19be 100755 --- a/tools/clang-tidy.sh +++ b/tools/clang-tidy.sh @@ -1,11 +1,11 @@ #!/usr/bin/env bash # Use clang-tidy to brace if statements and loops. This should be a feature of clang-format. -# The brace check is the only check being applied right now, -# but other checks (like naming scheme) may be added at a later time. +# The brace check is the only check being applied right now, +# but other checks (like naming scheme) may be added at a later time. # '--fix-errors` due to generated text_strings.h as well as the enhancement inc.c files -TIDY_OPTS="-p . --fix --fix-errors" +TIDY_OPTS="-p . --fix --fix-errors" COMPILER_OPTS="-nostdinc -fno-builtin -std=gnu90 -Iinclude -Isrc -D_LANGUAGE_C" VERSIONS="-DVERSION_US -DVERSION_JP -DVERSION_EU" @@ -15,7 +15,7 @@ cd "$( dirname $0 )" >/dev/null 2>&1; cd ../ if (( $# > 0 )); then printf "Tidy file(s) $*" echo - for VER in ${VERSIONS}; do + for VER in ${VERSIONS}; do echo "with compiler version flag ${VER}" clang-tidy ${TIDY_OPTS} "$@" -- ${COMPILER_OPTS} ${VER} done @@ -25,7 +25,7 @@ if (( $# > 0 )); then fi echo "Tidying all C files for all versions. This will take a bit" -for VER in ${VERSIONS}; do +for VER in ${VERSIONS}; do echo "Tidying for compiler version flag ${VER}" # Don't run clang-tidy on behaviors clang-tidy ${TIDY_OPTS} src/audio/*.c -- ${COMPILER_OPTS} ${VER} diff --git a/tools/create_patch.sh b/tools/create_patch.sh index ea75d9cc..689f11dd 100755 --- a/tools/create_patch.sh +++ b/tools/create_patch.sh @@ -21,5 +21,5 @@ fi git add . # Generate the patch. git diff -p --staged > "$1" -# Undo the 'git add'. +# Undo the 'git add'. git reset diff --git a/tools/demo_data_converter.py b/tools/demo_data_converter.py index 86ea94c5..e05b14bb 100755 --- a/tools/demo_data_converter.py +++ b/tools/demo_data_converter.py @@ -23,7 +23,7 @@ def main(): prog_args.append(a) defines = [d.split("=")[0] for d in defines] - + if len(prog_args) < 1 or need_help: print("Usage: {} [-D ] > ".format(sys.argv[0])) sys.exit(0 if need_help else 1) diff --git a/tools/extract_data_for_mio.c b/tools/extract_data_for_mio.c index 3d13185a..68b2697e 100644 --- a/tools/extract_data_for_mio.c +++ b/tools/extract_data_for_mio.c @@ -145,7 +145,7 @@ uint16_t u16be(uint16_t val) { return __builtin_bswap16(val); #else return val; -#endif +#endif } static bool elf_get_section_range(uint8_t *file, const char *searched_name, uint32_t *address, uint32_t *offset, uint32_t *size, uint32_t *section_index) { diff --git a/tools/n64graphics_ci_dir/README.md b/tools/n64graphics_ci_dir/README.md index 14bda5da..9f23e2a2 100644 --- a/tools/n64graphics_ci_dir/README.md +++ b/tools/n64graphics_ci_dir/README.md @@ -6,7 +6,7 @@ CI4 textures will always assume a 16 color palette is used, and CI8 textures a 2 ## Libraries Used (All MIT licensed) -* **Exoquant** by Dennis Ranke, for color reduction. https://github.com/exoticorn/exoquant +* **Exoquant** by Dennis Ranke, for color reduction. https://github.com/exoticorn/exoquant * **stb** by Sean Barrett, for loading PNG images. https://github.com/nothings/stb ## PNG -> CI4 + Palette diff --git a/tools/patch_elf_32bit.c b/tools/patch_elf_32bit.c index 8e529520..edf0c36b 100644 --- a/tools/patch_elf_32bit.c +++ b/tools/patch_elf_32bit.c @@ -80,7 +80,7 @@ struct ar_header { //These constants found by inspecting output of objdump #define FLAGS_MIPS3 0x20 -#define FLAGS_O32ABI 0x100000 +#define FLAGS_O32ABI 0x100000 int fix_mips_elf(FILE *f, size_t filesize) { diff --git a/tools/skyconv.c b/tools/skyconv.c index 5db4419e..f04ffcff 100644 --- a/tools/skyconv.c +++ b/tools/skyconv.c @@ -535,7 +535,7 @@ static int parse_arguments(int argc, char *argv[]) { output = argv[i]; } - + if (strcmp(argv[i], "--type") == 0) { if (++i >= argc || type != InvalidType) { goto invalid; @@ -576,7 +576,7 @@ bool imageMatchesDimensions(int width, int height) { break; } } - + if (!matchesDimensions) { if (type != CakeEU) { fprintf(stderr, "err: That type of image must be either %d x %d or %d x %d. Yours is %d x %d.\n", @@ -645,7 +645,7 @@ int main(int argc, char *argv[]) { } allocate_tiles(); - + init_tiles(image, expanded); switch (type) { case Skybox: diff --git a/tools/slienc.c b/tools/slienc.c index ec44e519..d12b057f 100644 --- a/tools/slienc.c +++ b/tools/slienc.c @@ -38,24 +38,24 @@ int main(int argc, const char **argv, const char **envp) fprintf(stderr, "slienc [infile] [outfile]\n"); return 1; } - + strcpy(src, argv[1]); strcpy(dest, argv[2]); - + if ((fp = fopen(src, "rb")) == NULL) { fprintf(stderr, "FILE OPEN ERROR![%s]\n", src); return 1; } - + fseek(fp, 0, SEEK_END); insize = ftell(fp); fseek(fp, 0, SEEK_SET); - + bz = malloc(insize); size_t fread_result = fread(bz, 1, insize, fp); fclose(fp); - + for (int i = 0; src[i]; i++) { if (src[i] == '.') @@ -64,31 +64,31 @@ int main(int argc, const char **argv, const char **envp) break; } } - + if ((fp = fopen(dest, "wb")) == NULL) { fprintf(stderr, "FILE CREATE ERROR![%s]\n", dest); exit(1); } - + encode(); - + fprintf(fp, "Yay0"); - + writeint4(insize); - + writeint4(4 * cp + 16); writeint4(2 * pp + 4 * cp + 16); - + for (int i = 0; i < cp; i++) writeint4(cmd[i]); - + for (int i = 0; i < pp; i++) writeshort(pol[i]); - + fwrite(def, 1u, dp, fp); fclose(fp); - + return 0; } @@ -299,7 +299,7 @@ void initskip(unsigned char *pattern, int len) { for (int i = 0; i < 256; i++) skip[i] = len; - + for (int i = 0; i < len; i++) skip[pattern[i]] = len - i - 1; } diff --git a/tools/stb/stb_image.h b/tools/stb/stb_image.h index d9c21bc8..acec20a1 100644 --- a/tools/stb/stb_image.h +++ b/tools/stb/stb_image.h @@ -1077,8 +1077,8 @@ static void stbi__vertical_flip_slices(void *image, int w, int h, int z, int byt stbi_uc *bytes = (stbi_uc *)image; for (slice = 0; slice < z; ++slice) { - stbi__vertical_flip(bytes, w, h, bytes_per_pixel); - bytes += slice_size; + stbi__vertical_flip(bytes, w, h, bytes_per_pixel); + bytes += slice_size; } } @@ -1237,15 +1237,15 @@ STBIDEF stbi_uc *stbi_load_from_callbacks(stbi_io_callbacks const *clbk, void *u STBIDEF stbi_uc *stbi_load_gif_from_memory(stbi_uc const *buffer, int len, int **delays, int *x, int *y, int *z, int *comp, int req_comp) { unsigned char *result; - stbi__context s; - stbi__start_mem(&s,buffer,len); - + stbi__context s; + stbi__start_mem(&s,buffer,len); + result = (unsigned char*) stbi__load_gif_main(&s, delays, x, y, z, comp, req_comp); if (stbi__vertically_flip_on_load) { - stbi__vertical_flip_slices( result, *x, *y, *z, *comp ); + stbi__vertical_flip_slices( result, *x, *y, *z, *comp ); } - return result; + return result; } #endif @@ -6127,7 +6127,7 @@ typedef struct int w,h; stbi_uc *out; // output buffer (always 4 components) stbi_uc *background; // The current "background" as far as a gif is concerned - stbi_uc *history; + stbi_uc *history; int flags, bgindex, ratio, transparent, eflags; stbi_uc pal[256][4]; stbi_uc lpal[256][4]; @@ -6215,7 +6215,7 @@ static int stbi__gif_info_raw(stbi__context *s, int *x, int *y, int *comp) static void stbi__out_gif_code(stbi__gif *g, stbi__uint16 code) { stbi_uc *p, *c; - int idx; + int idx; // recurse to decode the prefixes, since the linked-list is backwards, // and working backwards through an interleaved image would be nasty @@ -6224,12 +6224,12 @@ static void stbi__out_gif_code(stbi__gif *g, stbi__uint16 code) if (g->cur_y >= g->max_y) return; - idx = g->cur_x + g->cur_y; + idx = g->cur_x + g->cur_y; p = &g->out[idx]; - g->history[idx / 4] = 1; + g->history[idx / 4] = 1; c = &g->color_table[g->codes[code].suffix * 4]; - if (c[3] > 128) { // don't render transparent pixels; + if (c[3] > 128) { // don't render transparent pixels; p[0] = c[2]; p[1] = c[1]; p[2] = c[0]; @@ -6338,31 +6338,31 @@ static stbi_uc *stbi__process_gif_raster(stbi__context *s, stbi__gif *g) // two back is the image from two frames ago, used for a very specific disposal format static stbi_uc *stbi__gif_load_next(stbi__context *s, stbi__gif *g, int *comp, int req_comp, stbi_uc *two_back) { - int dispose; - int first_frame; - int pi; - int pcount; + int dispose; + int first_frame; + int pi; + int pcount; // on first frame, any non-written pixels get the background colour (non-transparent) - first_frame = 0; + first_frame = 0; if (g->out == 0) { if (!stbi__gif_header(s, g, comp,0)) return 0; // stbi__g_failure_reason set by stbi__gif_header g->out = (stbi_uc *) stbi__malloc(4 * g->w * g->h); - g->background = (stbi_uc *) stbi__malloc(4 * g->w * g->h); - g->history = (stbi_uc *) stbi__malloc(g->w * g->h); + g->background = (stbi_uc *) stbi__malloc(4 * g->w * g->h); + g->history = (stbi_uc *) stbi__malloc(g->w * g->h); if (g->out == 0) return stbi__errpuc("outofmem", "Out of memory"); - // image is treated as "tranparent" at the start - ie, nothing overwrites the current background; + // image is treated as "tranparent" at the start - ie, nothing overwrites the current background; // background colour is only used for pixels that are not rendered first frame, after that "background" - // color refers to teh color that was there the previous frame. - memset( g->out, 0x00, 4 * g->w * g->h ); + // color refers to teh color that was there the previous frame. + memset( g->out, 0x00, 4 * g->w * g->h ); memset( g->background, 0x00, 4 * g->w * g->h ); // state of the background (starts transparent) memset( g->history, 0x00, g->w * g->h ); // pixels that were affected previous frame - first_frame = 1; + first_frame = 1; } else { // second frame - how do we dispoase of the previous one? - dispose = (g->eflags & 0x1C) >> 2; - pcount = g->w * g->h; + dispose = (g->eflags & 0x1C) >> 2; + pcount = g->w * g->h; if ((dispose == 3) && (two_back == 0)) { dispose = 2; // if I don't have an image to revert back to, default to the old background @@ -6371,32 +6371,32 @@ static stbi_uc *stbi__gif_load_next(stbi__context *s, stbi__gif *g, int *comp, i if (dispose == 3) { // use previous graphic for (pi = 0; pi < pcount; ++pi) { if (g->history[pi]) { - memcpy( &g->out[pi * 4], &two_back[pi * 4], 4 ); + memcpy( &g->out[pi * 4], &two_back[pi * 4], 4 ); } } - } else if (dispose == 2) { - // restore what was changed last frame to background before that frame; + } else if (dispose == 2) { + // restore what was changed last frame to background before that frame; for (pi = 0; pi < pcount; ++pi) { if (g->history[pi]) { - memcpy( &g->out[pi * 4], &g->background[pi * 4], 4 ); + memcpy( &g->out[pi * 4], &g->background[pi * 4], 4 ); } } } else { - // This is a non-disposal case eithe way, so just + // This is a non-disposal case eithe way, so just // leave the pixels as is, and they will become the new background // 1: do not dispose // 0: not specified. } - // background is what out is after the undoing of the previou frame; - memcpy( g->background, g->out, 4 * g->w * g->h ); + // background is what out is after the undoing of the previou frame; + memcpy( g->background, g->out, 4 * g->w * g->h ); } - // clear my history; + // clear my history; memset( g->history, 0x00, g->w * g->h ); // pixels that were affected previous frame for (;;) { - int tag = stbi__get8(s); + int tag = stbi__get8(s); switch (tag) { case 0x2C: /* Image Descriptor */ { @@ -6434,19 +6434,19 @@ static stbi_uc *stbi__gif_load_next(stbi__context *s, stbi__gif *g, int *comp, i } else if (g->flags & 0x80) { g->color_table = (stbi_uc *) g->pal; } else - return stbi__errpuc("missing color table", "Corrupt GIF"); - + return stbi__errpuc("missing color table", "Corrupt GIF"); + o = stbi__process_gif_raster(s, g); if (o == NULL) return NULL; - // if this was the first frame, - pcount = g->w * g->h; + // if this was the first frame, + pcount = g->w * g->h; if (first_frame && (g->bgindex > 0)) { // if first frame, any pixel not drawn to gets the background color for (pi = 0; pi < pcount; ++pi) { if (g->history[pi] == 0) { - g->pal[g->bgindex][3] = 255; // just in case it was made transparent, undo that; It will be reset next frame if need be; - memcpy( &g->out[pi * 4], &g->pal[g->bgindex], 4 ); + g->pal[g->bgindex][3] = 255; // just in case it was made transparent, undo that; It will be reset next frame if need be; + memcpy( &g->out[pi * 4], &g->pal[g->bgindex], 4 ); } } } @@ -6457,7 +6457,7 @@ static stbi_uc *stbi__gif_load_next(stbi__context *s, stbi__gif *g, int *comp, i case 0x21: // Comment Extension. { int len; - int ext = stbi__get8(s); + int ext = stbi__get8(s); if (ext == 0xF9) { // Graphic Control Extension. len = stbi__get8(s); if (len == 4) { @@ -6466,23 +6466,23 @@ static stbi_uc *stbi__gif_load_next(stbi__context *s, stbi__gif *g, int *comp, i // unset old transparent if (g->transparent >= 0) { - g->pal[g->transparent][3] = 255; - } + g->pal[g->transparent][3] = 255; + } if (g->eflags & 0x01) { g->transparent = stbi__get8(s); if (g->transparent >= 0) { - g->pal[g->transparent][3] = 0; + g->pal[g->transparent][3] = 0; } } else { // don't need transparent - stbi__skip(s, 1); - g->transparent = -1; + stbi__skip(s, 1); + g->transparent = -1; } } else { stbi__skip(s, len); break; } - } + } while ((len = stbi__get8(s)) != 0) { stbi__skip(s, len); } @@ -6501,15 +6501,15 @@ static stbi_uc *stbi__gif_load_next(stbi__context *s, stbi__gif *g, int *comp, i static void *stbi__load_gif_main(stbi__context *s, int **delays, int *x, int *y, int *z, int *comp, int req_comp) { if (stbi__gif_test(s)) { - int layers = 0; + int layers = 0; stbi_uc *u = 0; stbi_uc *out = 0; - stbi_uc *two_back = 0; + stbi_uc *two_back = 0; stbi__gif g; - int stride; + int stride; memset(&g, 0, sizeof(g)); if (delays) { - *delays = 0; + *delays = 0; } do { @@ -6519,44 +6519,44 @@ static void *stbi__load_gif_main(stbi__context *s, int **delays, int *x, int *y, if (u) { *x = g.w; *y = g.h; - ++layers; - stride = g.w * g.h * 4; - + ++layers; + stride = g.w * g.h * 4; + if (out) { - out = (stbi_uc*) STBI_REALLOC( out, layers * stride ); + out = (stbi_uc*) STBI_REALLOC( out, layers * stride ); if (delays) { - *delays = (int*) STBI_REALLOC( *delays, sizeof(int) * layers ); + *delays = (int*) STBI_REALLOC( *delays, sizeof(int) * layers ); } } else { - out = (stbi_uc*)stbi__malloc( layers * stride ); + out = (stbi_uc*)stbi__malloc( layers * stride ); if (delays) { - *delays = (int*) stbi__malloc( layers * sizeof(int) ); + *delays = (int*) stbi__malloc( layers * sizeof(int) ); } } - memcpy( out + ((layers - 1) * stride), u, stride ); + memcpy( out + ((layers - 1) * stride), u, stride ); if (layers >= 2) { - two_back = out - 2 * stride; + two_back = out - 2 * stride; } if (delays) { - (*delays)[layers - 1U] = g.delay; + (*delays)[layers - 1U] = g.delay; } } - } while (u != 0); + } while (u != 0); - // free temp buffer; - STBI_FREE(g.out); - STBI_FREE(g.history); - STBI_FREE(g.background); + // free temp buffer; + STBI_FREE(g.out); + STBI_FREE(g.history); + STBI_FREE(g.background); - // do the final conversion after loading everything; + // do the final conversion after loading everything; if (req_comp && req_comp != 4) out = stbi__convert_format(out, 4, req_comp, layers * g.w, g.h); - *z = layers; + *z = layers; return out; } else { - return stbi__errpuc("not GIF", "Image was not as a gif type."); + return stbi__errpuc("not GIF", "Image was not as a gif type."); } } @@ -6573,14 +6573,14 @@ static void *stbi__gif_load(stbi__context *s, int *x, int *y, int *comp, int req *y = g.h; // moved conversion to after successful load so that the same - // can be done for multiple frames. + // can be done for multiple frames. if (req_comp && req_comp != 4) u = stbi__convert_format(u, 4, req_comp, g.w, g.h); } - // free buffers needed for multiple frame loading; + // free buffers needed for multiple frame loading; STBI_FREE(g.history); - STBI_FREE(g.background); + STBI_FREE(g.background); return u; } diff --git a/tools/stb/stb_image_write.h b/tools/stb/stb_image_write.h index c05e9581..6354335b 100644 --- a/tools/stb/stb_image_write.h +++ b/tools/stb/stb_image_write.h @@ -10,7 +10,7 @@ Will probably not work correctly with strict-aliasing optimizations. - If using a modern Microsoft Compiler, non-safe versions of CRT calls may cause + If using a modern Microsoft Compiler, non-safe versions of CRT calls may cause compilation warnings or even errors. To avoid this, also before #including, #define STBI_MSC_SECURE_CRT @@ -103,7 +103,7 @@ USAGE: TGA supports RLE or non-RLE compressed data. To use non-RLE-compressed data, set the global variable 'stbi_write_tga_with_rle' to 0. - + JPEG does ignore alpha channels in input data; quality is between 1 and 100. Higher quality looks better but results in a bigger image. JPEG baseline (no JPEG progressive). @@ -111,7 +111,7 @@ USAGE: CREDITS: - Sean Barrett - PNG/BMP/TGA + Sean Barrett - PNG/BMP/TGA Baldur Karlsson - HDR Jean-Sebastien Guay - TGA monochrome Tim Kelsey - misc enhancements @@ -1356,7 +1356,7 @@ static int stbi_write_jpg_core(stbi__write_context *s, int width, int height, in 37,56,68,109,103,77,24,35,55,64,81,104,113,92,49,64,78,87,103,121,120,101,72,92,95,98,112,100,103,99}; static const int UVQT[] = {17,18,24,47,99,99,99,99,18,21,26,66,99,99,99,99,24,26,56,99,99,99,99,99,47,66,99,99,99,99,99,99, 99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99}; - static const float aasf[] = { 1.0f * 2.828427125f, 1.387039845f * 2.828427125f, 1.306562965f * 2.828427125f, 1.175875602f * 2.828427125f, + static const float aasf[] = { 1.0f * 2.828427125f, 1.387039845f * 2.828427125f, 1.306562965f * 2.828427125f, 1.175875602f * 2.828427125f, 1.0f * 2.828427125f, 0.785694958f * 2.828427125f, 0.541196100f * 2.828427125f, 0.275899379f * 2.828427125f }; int row, col, i, k; @@ -1531,38 +1531,38 @@ This software is available under 2 licenses -- choose whichever you prefer. ------------------------------------------------------------------------------ ALTERNATIVE A - MIT License Copyright (c) 2017 Sean Barrett -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in all +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ------------------------------------------------------------------------------ ALTERNATIVE B - Public Domain (www.unlicense.org) This is free and unencumbered software released into the public domain. -Anyone is free to copy, modify, publish, use, compile, sell, or distribute this -software, either in source code form or as a compiled binary, for any purpose, +Anyone is free to copy, modify, publish, use, compile, sell, or distribute this +software, either in source code form or as a compiled binary, for any purpose, commercial or non-commercial, and by any means. -In jurisdictions that recognize copyright laws, the author or authors of this -software dedicate any and all copyright interest in the software to the public -domain. We make this dedication for the benefit of the public at large and to -the detriment of our heirs and successors. We intend this dedication to be an -overt act of relinquishment in perpetuity of all present and future rights to +In jurisdictions that recognize copyright laws, the author or authors of this +software dedicate any and all copyright interest in the software to the public +domain. We make this dedication for the benefit of the public at large and to +the detriment of our heirs and successors. We intend this dedication to be an +overt act of relinquishment in perpetuity of all present and future rights to this software under copyright law. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ------------------------------------------------------------------------------ */ diff --git a/tools/util/audiofile_strip.patch b/tools/util/audiofile_strip.patch index e6e22470..1ad5c3af 100644 --- a/tools/util/audiofile_strip.patch +++ b/tools/util/audiofile_strip.patch @@ -36,10 +36,10 @@ index 64e798b..374838b 100644 @@ -47,7 +47,7 @@ AUpvlist AUpvnew (int maxitems) if (aupvlist == NULL) return AU_NULL_PVLIST; - + - aupvlist->items = calloc(maxitems, sizeof (struct _AUpvitem)); + aupvlist->items = (struct _AUpvitem *)calloc(maxitems, sizeof (struct _AUpvitem)); - + assert(aupvlist->items); if (aupvlist->items == NULL) diff --git a/libaudiofile/g711.c b/libaudiofile/g711.c @@ -72,7 +72,7 @@ index ffd0a63..51d2dc3 100644 +++ b/libaudiofile/units.cpp @@ -32,24 +32,12 @@ #include "units.h" - + #include "AIFF.h" -#include "AVR.h" -#include "CAF.h" @@ -85,16 +85,16 @@ index ffd0a63..51d2dc3 100644 -#include "SampleVision.h" -#include "VOC.h" #include "WAVE.h" - + #include "compression.h" - + -#include "modules/ALAC.h" -#include "modules/FLAC.h" #include "modules/G711.h" -#include "modules/IMA.h" #include "modules/MSADPCM.h" #include "modules/PCM.h" - + @@ -99,20 +87,6 @@ const Unit _af_units[_AF_NUM_UNITS] = _AF_AIFF_NUM_INSTPARAMS, _af_aiff_inst_params @@ -259,7 +259,7 @@ index ffd0a63..51d2dc3 100644 - NULL // instrument parameters - } }; - + const CompressionUnit _af_compression[_AF_NUM_COMPRESSION] = @@ -309,19 +145,6 @@ const CompressionUnit _af_compression[_AF_NUM_COMPRESSION] = _af_g711_format_ok,