Leahnaya/pokepinballrs
1
0
Fork 0
mirror of https://github.com/pret/pokepinballrs.git synced 2026-03-21 17:24:13 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

sharpedo/wailmer helper table {oam/variant} and wailmer graphics (#190)
Some checks are pending
CI / build (push) Waiting to run
Details

Browse Source 
* sharpedo/wailmer helper table {oam/variant} and wailmer graphics

* Naming for known Gfx variables

* name known Oam object data
This commit is contained in:
Retnuhytnuob 2026-02-14 15:34:44 -06:00 committed by GitHub
parent a0c21c3947
commit b480b7a99f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
14 changed files with 201 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
data/rom_1.s
View File

@ -1318,14 +1318,19 @@ gUnknown_08137D78:: @ 0x08137D78
gUnknown_08137DA4:: @ 0x08137DA4
.incbin "baserom.gba", 0x137DA4, 0x1A
gUnknown_08137DBE:: @ 0x08137DBE
.byte ' ','B','A','L','L','-','M','V',':',0,0,0,0,0
.byte ' ','B','A','L','L','-','S','P','D',':',0,0,0,0
.byte ' ',' ','D','E','B','U','G','1',':',0,0,0,0,0
gDebugTextStrings:: @ 0x08137DBE
.ascii " BALL-MV:"
.byte 0,0,0,0,0
.ascii " BALL-SPD:"
.byte 0,0,0,0
.ascii " DEBUG1:"
.byte 0,0,0,0,0
gUnknown_08137DE8:: @ 0x08137DE8
.byte '(','0','0','0',' ','0','0','0',')',0,0,0
.byte '(','0','0','0',')',' ',' ',' ',' ',0,0,0
.ascii "(000 000)"
.byte 0,0,0
.ascii "(000) "
.byte 0,0,0
gUnknown_08137E00:: @ 0x08137E00
.incbin "baserom.gba", 0x137E00, 0x4
@ -1812,8 +1817,8 @@ gUnknown_083FF04C:: @ 0x083FF04C
gUnknown_083FFD4C:: @ 0x083FFD4C
.incbin "baserom.gba", 0x3FFD4C, 0x40
gUnknown_083FFD8C:: @ 0x083FFD8C
.incbin "baserom.gba", 0x3FFD8C, 0xF00 @ 0x47D00
gSapphireBoardWailmer_Gfx:: @ 0x083FFD8C
.incbin "graphics/stage/sapphire/wailmer.4bpp";
.include "data/graphics/mon_catch_sprites.inc"
@ -1916,7 +1921,7 @@ gUnknown_0848FD8C:: @ 0x0848FD8C
gUnknown_08490A4C:: @ 0x08490A4C
.incbin "baserom.gba", 0x490A4C, 0x4400
gUnknown_08494E4C:: @ 0x08494E4C
gDusclopsBoardDusclopsAppearFx_Gfx:: @ 0x08494E4C
.incbin "graphics/stage/dusclops/dusclops_appear_fx.4bpp";
gUnknown_0849664C:: @ 0x0849664C
@ -1986,61 +1991,61 @@ gUnknown_084C4B6C:: @ 0x084C4B6C
.incbin "baserom.gba", 0x4ECF6C, 0x160 @ 0x4ED0CC - 0x4ECF6C
gUnknown_084ED0CC:: @ 0x084ED0CC
gRubyBoardShopDoor_Gfx:: @ 0x084ED0CC
.incbin "graphics/stage/ruby/shop_door.4bpp";
gUnknown_084ED6CC:: @ 0x084ED6CC
.incbin "graphics/stage/gunk_084ED6CC.4bpp";
gUnknown_084EDACC:: @ 0x084EDACC
gDusclopsBoardDusclops_Gfx:: @ 0x084EDACC
.incbin "graphics/stage/dusclops/dusclops.4bpp";
gUnknown_084F5ACC:: @ 0x084F5ACC
gRubyBoardSharpedo_Gfx:: @ 0x084F5ACC
.incbin "graphics/stage/ruby/sharpedo.4bpp";
gUnknown_084F61EC:: @ 0x084F61EC
.incbin "graphics/stage/main/gunk_084F61EC.4bpp";
gUnknown_084F6B0C:: @ 0x084F6B0C
gRubyBoardShop_Gfx:: @ 0x084F6B0C
.incbin "graphics/stage/ruby/shop.4bpp";
gUnknown_084FA20C:: @ 0x084FA20C
.incbin "graphics/stage/misc/gunk_084FA20C.4bpp";
gUnknown_084FA48C:: @ 0x084FA48C
gMainBoardPikaSpinner_Gfx:: @ 0x084FA48C
.incbin "graphics/stage/main/pika_spinner.4bpp";
gUnknown_084FB68C:: @ 0x084FB68C
gRubyBoardHatchCave_Gfx:: @ 0x084FB68C
.incbin "graphics/stage/ruby/hatch_cave.4bpp";
gUnknown_084FD18C:: @ 0x084FD18C
.incbin "graphics/stage/main/egg.4bpp";
gUnknown_084FDF8C:: @ 0x084FDF8C
gSapphireBoardSeedot_Gfx:: @ 0x084FDF8C
.incbin "graphics/stage/sapphire/seedot.4bpp";
gUnknown_084FEA0C:: @ 0x084FEA0C
gSapphireBoardShopShockWall_Gfx:: @ 0x084FEA0C
.incbin "graphics/stage/sapphire/shop_shock_wall.4bpp";
gUnknown_084FEF0C:: @ 0x084FEF0C
gRubyBoardRampPrize_Gfx:: @ 0x084FEF0C
.incbin "graphics/stage/ruby/ramp_prize.4bpp";
gUnknown_084FF30C:: @ 0x084FF30C
gDusclopsBoardDusclopsBallGrabSwirl_Gfx:: @ 0x084FF30C
.incbin "graphics/stage/dusclops/dusclops_ball_grab.4bpp";
gUnknown_084FF90C:: @ 0x084FF90C
.incbin "baserom.gba", 0x4FF90C, 0x1700
gUnknown_0850100C:: @ 0x0850100C
gMainBoardBallSave_Gfx:: @ 0x0850100C
.incbin "graphics/stage/main/ball_save.4bpp";
gUnknown_085028CC:: @ 0x085028CC
gMainBoardBallSaveLatios_Gfx:: @ 0x085028CC
.incbin "graphics/stage/main/latios.4bpp";
gUnknown_085038CC:: @ 0x085038CC
gMainBoardBallSaveLatiosArm_Gfx:: @ 0x085038CC
.incbin "graphics/stage/main/latios_arm.4bpp";
gUnknown_0850398C:: @ 0x0850398C
gMainBoardEndOfBall_Gfx:: @ 0x0850398C
.incbin "graphics/stage/main/end_of_ball.4bpp";
gUnknown_0850558C:: @ 0x0850558C
@ -2049,25 +2054,25 @@ gUnknown_0850558C:: @ 0x0850558C
gUnknown_08505B8C:: @ 0x08505B8C
.incbin "baserom.gba", 0x505B8C, 0x40
gUnknown_08505BCC:: @ 0x08505BCC
gMainBoardEvoBanner_Gfx:: @ 0x08505BCC
.incbin "graphics/stage/main/evo_banner.4bpp";
gUnknown_08509F4C:: @ 0x08509F4C
gMainBoardGameOverText_Gfx:: @ 0x08509F4C
.incbin "graphics/stage/main/game_over_text.4bpp";
gUnknown_0850A34C:: @ 0x0850A34C
gMainBoardJirachiBanner_Gfx:: @ 0x0850A34C
.incbin "graphics/stage/main/jirachi_banner.4bpp";
gUnknown_0850E6CC:: @ 0x0850E6CC
gMainBoardTravel_Gfx:: @ 0x0850E6CC
.incbin "graphics/stage/main/travel.4bpp";
gUnknown_08510CAC:: @ 0x08510CAC
gPauseMenuText_Gfx:: @ 0x08510CAC
.incbin "graphics/stage/main/pause_menu_text.4bpp";
gUnknown_08510E4C:: @ 0x08510E4C
gDusclopsBoardDuskull_Gfx:: @ 0x08510E4C
.incbin "graphics/stage/dusclops/duskull.4bpp";
gUnknown_08512C4C:: @ 0x08512C4C
gSapphireBoardZigzagoon_Gfx:: @ 0x08512C4C
.incbin "graphics/stage/sapphire/zigzagoon.4bpp";
gUnknown_08514F4C:: @ 0x08514F4C
@ -2094,7 +2099,7 @@ gUnknown_08521FCC:: @ 0x08521FCC
gUnknown_085223AC:: @ 0x085223AC
.incbin "baserom.gba", 0x5223AC, 0x4A20
gUnknown_08526DCC:: @ 0x08526DCC
gSapphireBoardZigzagoonFx_Gfx:: @ 0x08526DCC
.incbin "graphics/stage/sapphire/zigzagoon_fx.4bpp";
.incbin "baserom.gba", 0x5279CC, 0x356
@ -2130,7 +2135,7 @@ gOptionsSEList:: @ 0x08527D66
.2byte SE_UNKNOWN_0xD3, SE_UNKNOWN_0xD4, SE_UNKNOWN_0xD5, SE_UNKNOWN_0xD6, SE_UNKNOWN_0xD7
.2byte SE_UNKNOWN_0xD8, SE_UNKNOWN_0xDC, SE_UNKNOWN_0xDD, SE_UNKNOWN_0xDE, SE_UNKNOWN_0xDF
.2byte SE_UNKNOWN_0xE0, SE_UNKNOWN_0xE1, SE_UNKNOWN_0xE2, SE_UNKNOWN_0xE3, SE_UNKNOWN_0xE4
.2byte SE_UNKNOWN_0xE5, SE_UNKNOWN_0xE6, SE_UNKNOWN_0xE7, SE_UNKNOWN_0xE8, SE_UNKNOWN_0xE9
.2byte SE_UNKNOWN_0xEA, SE_UNKNOWN_0xEB, SE_UNKNOWN_0xEC, SE_UNKNOWN_0xF1, SE_UNKNOWN_0xF2
.2byte SE_DUSCLOPS_DEPART_INCOMPLETE, SE_DUSCLOPS_MOVE, SE_DUSCLOPS_APPEAR, SE_DUSCLOPS_HIT, SE_DUSCLOPS_BALL_ABSORB

54
data/rom_2.s
View File

@ -571,9 +571,9 @@ gUnknown_086ACEF8:: @ 0x086ACEF8
.4byte 0x000000
.4byte gUnknown_0851514C
.4byte gUnknown_085223AC
.4byte gUnknown_08505BCC
.4byte gUnknown_0850E6CC
.4byte gUnknown_0850A34C
.4byte gMainBoardEvoBanner_Gfx
.4byte gMainBoardTravel_Gfx
.4byte gMainBoardJirachiBanner_Gfx
.4byte gUnknown_0851976C
.4byte gUnknown_0851DB8C
@ -591,7 +591,7 @@ gUnknown_086ACFA0:: @ 0x086ACFA0
gUnknown_086ACFE0:: @ 0x086ACFE0
.2byte 'W','A','S',' ','C','A','U','G','H','T';
gUnknown_086ACFF4:: @ 0x086ACFF4
.incbin "baserom.gba", 0x6ACFF4, 0xC
@ -748,7 +748,29 @@ gUnknown_086AD9EC:: @ 0x086AD9EC
.incbin "baserom.gba", 0x6AD9EC, 0x10
gUnknown_086AD9FC:: @ 0x086AD9FC
.incbin "baserom.gba", 0x6AD9FC, 0x5C
.2byte 0x0, 0x0
.2byte 0x1, 0x0
.2byte 0x2, 0x1
.2byte 0x3, 0x1
.2byte 0x4, 0x1
.2byte 0x0, 0x0
.2byte 0x5, 0x2
.2byte 0x6, 0x2
.2byte 0x7, 0x0
.2byte 0x8, 0x0
.2byte 0x9, 0x0
.2byte 0xA, 0x0
.2byte 0xB, 0x0
.2byte 0xC, 0x0
.2byte 0xD, 0x0
.2byte 0xE, 0x0
.2byte 0xF, 0x0
.2byte 0x5, 0x2
.2byte 0x10, 0x2
.2byte 0x11, 0x2
.2byte 0x12, 0x2
.2byte 0x13, 0x2
.2byte 0x14, 0x2
gUnknown_086ADA58:: @ 0x086ADA58
.incbin "baserom.gba", 0x6ADA58, 0x16
@ -841,7 +863,19 @@ gUnknown_086AE45A:: @ 0x086AE45A
.incbin "baserom.gba", 0x6AE45A, 0x8
gUnknown_086AE462:: @ 0x086AE462
.incbin "baserom.gba", 0x6AE462, 0x34
.2byte 0x0, 0x0
.2byte 0x1, 0x1
.2byte 0x2, 0x2
.2byte 0x3, 0x3
.2byte 0x4, 0x2
.2byte 0x5, 0x1
.2byte 0x6, 0x0
.2byte 0x7, 0x1
.2byte 0x8, 0x2
.2byte 0x9, 0x3
.2byte 0xA, 0x4
.2byte 0xB, 0x4
.2byte 0xC, 0x0
gUnknown_086AE496:: @ 0x086AE496
.incbin "baserom.gba", 0x6AE496, 0x66
@ -2059,7 +2093,7 @@ gUnknown_086B2FC0:: @ 0x086B2FC0
packed_sprite_oam x=0x0, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x1e4, priority=0x1, paletteNum=0x7
gUnknown_086B3A04:: @ 0x086B3A04
gSharpedoSpritesheetOam:: @ 0x086B3A04
packed_sprite_oam x=0xA, y=-0x1, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x161, priority=0x1, paletteNum=0x6
packed_sprite_oam x=0x0, y=0xF, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x163, priority=0x1, paletteNum=0x6
packed_sprite_oam x=0x20, y=0x17, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x173, priority=0x1, paletteNum=0x6
@ -2177,7 +2211,7 @@ gUnknown_086B3B7E:: @ 0x086B3B7E
packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x31a, priority=0x1, paletteNum=0x6
gUnknown_086B3CA4:: @ 0x086B3CA4
gSapphireBoardZigzagoonSpritesheetOam:: @ 0x086B3CA4
packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x151, priority=0x1, paletteNum=0x6
packed_sprite_oam x=0x20, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x161, priority=0x1, paletteNum=0x6
packed_sprite_oam x=0x0, y=0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x169, priority=0x1, paletteNum=0x6
@ -2243,7 +2277,7 @@ gUnknown_086B3CA4:: @ 0x086B3CA4
packed_sprite_oam x=0x0, y=0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x169, priority=0x1, paletteNum=0x6
gUnknown_086B3E1E:: @ 0x086B3E1E
gSapphireBoardSeedotSpritesheetOam:: @ 0x086B3E1E
packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x1e1, priority=0x1, paletteNum=0x7
packed_sprite_oam x=0x10, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x1e9, priority=0x1, paletteNum=0x7
packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x1e1, priority=0x1, paletteNum=0x7
@ -2800,7 +2834,7 @@ gUnknown_086B4922:: @ 0x086B4922
packed_sprite_oam x=0x0, y=-0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x3c3, priority=0x2, paletteNum=0x3
gUnknown_086B4A72:: @ 0x086B4A72
gWailmerSpritesheetOam:: @ 0x086B4A72
packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x1, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x139, priority=0x3, paletteNum=0x2
packed_sprite_oam x=0x20, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x1, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x149, priority=0x3, paletteNum=0x2
packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x1, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x139, priority=0x3, paletteNum=0x2

86
graphics/stage/sapphire/sapphire_gfx.json
View File

@ -1,41 +1,47 @@
{
"kind": "gfx-config",
"version": 1,
"defaults": {
"mwidth": 0,
"mheight": 0,
"oam": false,
"width": 16,
"palette": ""
},
"files": [
{
"gfx_filename": "seedot",
"mwidth":3,
"mheight":4,
"width":12,
"oam":true
},
{
"gfx_filename": "shop_shock_wall",
"mwidth":2,
"mheight":2,
"width":10
},
{
"gfx_filename": "zigzagoon",
"mheight":4,
"mwidth":7,
"oam":true
},
{
"gfx_filename": "zigzagoon_fx",
"mwidth":4
},
{
"gfx_filename": "seedot_basket",
"mwidth":4,
"oam":true
}
]
{
"kind": "gfx-config",
"version": 1,
"defaults": {
"mwidth": 0,
"mheight": 0,
"oam": false,
"width": 16,
"palette": ""
},
"files": [
{
"gfx_filename": "seedot",
"mwidth":3,
"mheight":4,
"width":12,
"oam":true
},
{
"gfx_filename": "shop_shock_wall",
"mwidth":2,
"mheight":2,
"width":10
},
{
"gfx_filename": "zigzagoon",
"mheight":4,
"mwidth":7,
"oam":true
},
{
"gfx_filename": "zigzagoon_fx",
"mwidth":4
},
{
"gfx_filename": "wailmer",
"mheight":4,
"mwidth":6,
"oam":true
},
{
"gfx_filename": "seedot_basket",
"mwidth":4,
"oam":true
}
]
}

BIN
graphics/stage/sapphire/wailmer.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 994 B

12
include/global.h
View File

@ -415,8 +415,8 @@ struct PinballGame
/*0x2F0*/ u8 unk2F0;
/*0x2F1*/ u8 unk2F1;
/*0x2F2*/ u16 unk2F2;
/*0x2F4*/ s8 unk2F4;
/*0x2F5*/ s8 unk2F5;
/*0x2F4*/ s8 unk2F4; //Sharpedo/Wailmer Oam Ix
/*0x2F5*/ s8 unk2F5; //Sharpedo tile variant Ix
/*0x2F6*/ u16 unk2F6;
/*0x2F8*/ s8 unk2F8;
/*0x2F9*/ s8 unk2F9;
@ -944,9 +944,9 @@ extern u16 gUnknown_0835E9C8[0x2A80];
extern const u16 gUnknown_08391A4C[0x1000];
extern const u16 gUnknown_08393A4C[0x1000];
extern u8 gUnknown_083FE44C[][0x200];
extern u16 gUnknown_08494E4C[];
extern u16 gUnknown_084EDACC[];
extern u8 gUnknown_084FF30C[];
extern u16 gDusclopsBoardDusclopsAppearFx_Gfx[];
extern u16 gDusclopsBoardDusclops_Gfx[];
extern u8 gDusclopsBoardDusclopsBallGrabSwirl_Gfx[];
extern struct SongHeader se_unk_8b;
extern struct SongHeader se_dusclops_appear;
extern const s16 gUnknown_086ACDF4[9]; //Possibly only 4, with a gap?
@ -987,7 +987,7 @@ extern const u8 gUnknown_0844838C[][0x300];
extern const u8 gUnknown_0848D68C[][0x300];
extern const u8 gUnknown_084C00EC[][0x80];
extern const u8 gUnknown_084C07EC[];
extern const u8 gUnknown_084FA48C[][0x120];
extern const u8 gMainBoardPikaSpinner_Gfx[][0x120];
extern const u8 gUnknown_084FD18C[][0x200];
extern const u8 *gUnknown_086AD49C[];
extern const u16 gUnknown_086AD2EE[][4];

10
src/board_process3_dusclops.c
View File

@ -535,7 +535,7 @@ void sub_336E0(void) {
}
}
extern const u8 gUnknown_08510E4C[];
extern const u8 gDusclopsBoardDuskull_Gfx[];
extern const u16 gDuskullSpritesheetOam[][2][3];
void sub_340EC() {
s16 i, j;
@ -548,7 +548,7 @@ void sub_340EC() {
for (i = 0; i < 3; i++)
{
s16 r8 = gCurrentPinballGame->unk397[i];
DmaCopy16(3, gUnknown_08510E4C + r8 * 0x280, OBJ_VRAM0 + 0x920 + i * 0x280, 0x280);
DmaCopy16(3, gDusclopsBoardDuskull_Gfx + r8 * 0x280, OBJ_VRAM0 + 0x920 + i * 0x280, 0x280);
sb = gCurrentPinballGame->unk39D[i];
spriteGroup = &gMain_spriteGroups[7 + i];
if (gCurrentPinballGame->unk3A6[i]) {
@ -985,7 +985,7 @@ void sub_34450(void)
break;
} //End switch
DmaCopy16(3 , gUnknown_084EDACC + r9 * 1024, (void *)OBJ_VRAM0+0x10a0, BG_SCREEN_SIZE);
DmaCopy16(3 , gDusclopsBoardDusclops_Gfx + r9 * 1024, (void *)OBJ_VRAM0+0x10a0, BG_SCREEN_SIZE);
gCurrentPinballGame->unk3F0 = ((gCurrentPinballGame->unk3E8 / 10) * 2) + 16;
gCurrentPinballGame->unk3F2 = ((gCurrentPinballGame->unk3EA / 10) * 2) + 16;
@ -1032,7 +1032,7 @@ void sub_34450(void)
s16 i;
u8 r1;
r1 = gMain.systemFrameCount % 4;
DmaCopy16(3 , gUnknown_08494E4C + r1 / 2 * 0x600, (void *)OBJ_VRAM0 + 0x1aa0, 0xc00);
DmaCopy16(3 , gDusclopsBoardDusclopsAppearFx_Gfx + r1 / 2 * 0x600, (void *)OBJ_VRAM0 + 0x1aa0, 0xc00);
for (i = 0; i < 2; i++)
{
@ -1062,7 +1062,7 @@ void sub_34450(void)
else
r9 = 2;
DmaCopy16(3 , gUnknown_084FF30C + r9 * 0x200,(void *)OBJ_VRAM0+0x18a0, 0x200);
DmaCopy16(3 , gDusclopsBoardDusclopsBallGrabSwirl_Gfx + r9 * 0x200,(void *)OBJ_VRAM0+0x18a0, 0x200);
}
else
{

26
src/debug_menu.c
View File

@ -8,15 +8,15 @@ extern s16 gUnknown_020306C0[];
extern s16 gUnknown_02030750[];
extern s16 gUnknown_02031500[];
extern const u8 gUnknown_08137DBE[];
extern const u8 gDebugTextStrings[];
extern const u8 gUnknown_08137DE8[];
extern u8 gUnknown_08137E00[];
extern const u8 gUnknown_0850100C[];
extern const u8 gUnknown_085028CC[];
extern const u8 gUnknown_085038CC[];
extern const u8 gUnknown_0850398C[];
extern const u8 gMainBoardBallSave_Gfx[];
extern const u8 gMainBoardBallSaveLatios_Gfx[];
extern const u8 gMainBoardBallSaveLatiosArm_Gfx[];
extern const u8 gMainBoardEndOfBall_Gfx[];
extern const u8 gUnknown_0850558C[][0x20];
extern const u8 gUnknown_08509F4C[];
extern const u8 gMainBoardGameOverText_Gfx[];
extern const u8 gUnknown_08514F4C[];
extern const u8 gUnknown_08514F6C[];
extern const u8 gUnknown_08521FAC[];
@ -80,7 +80,7 @@ void sub_47344(void)
u8 str0[42];
u8 str1[24];
memcpy(str0, gUnknown_08137DBE, 42);
memcpy(str0, gDebugTextStrings, 42);
memcpy(str1, gUnknown_08137DE8, 24);
for (i = 0x340; i < 0x380; i++)
@ -164,7 +164,7 @@ void sub_474F4(void)
if (gMain.unk12 == 3600)
{
DmaCopy16(3, gUnknown_08509F4C, (void *)0x06015800, 0x400);
DmaCopy16(3, gMainBoardGameOverText_Gfx, (void *)0x06015800, 0x400);
gMain.unk44[42]->available = 1;
for (i = 0; i < 8; i++)
{
@ -215,7 +215,7 @@ void sub_47670(void)
gMain.spriteGroups[6].available = 1;
gMain.spriteGroups[7].available = 1;
gMain.spriteGroups[8].available = 1;
DmaCopy16(3, gUnknown_0850398C, (void *)0x6015800, 0x2800);
DmaCopy16(3, gMainBoardEndOfBall_Gfx, (void *)0x6015800, 0x2800);
if (gMain.selectedField == FIELD_RUBY)
{
DmaCopy16(3, gUnknown_08521FAC, (void *)0x050003C0, 0x20);
@ -465,14 +465,14 @@ void sub_478D8(void)
gMain.spriteGroups[3].available = 1;
if (gMain.selectedField == FIELD_RUBY)
{
DmaCopy16(3, gUnknown_0850100C, (void *)0x06015800, 0x2400);
DmaCopy16(3, gUnknown_085028CC, (void *)0x06016800, 0x800);
DmaCopy16(3, gUnknown_085038CC, (void *)0x06017000, 0xC0);
DmaCopy16(3, gMainBoardBallSave_Gfx, (void *)0x06015800, 0x2400);
DmaCopy16(3, gMainBoardBallSaveLatios_Gfx, (void *)0x06016800, 0x800);
DmaCopy16(3, gMainBoardBallSaveLatiosArm_Gfx, (void *)0x06017000, 0xC0);
DmaCopy16(3, gUnknown_08514F4C, (void *)0x050003C0, 0x20);
}
else
{
DmaCopy16(3, gUnknown_0850100C, (void *)0x06015800, 0x2400);
DmaCopy16(3, gMainBoardBallSave_Gfx, (void *)0x06015800, 0x2400);
DmaCopy16(3, gUnknown_08514F6C, (void *)0x050003C0, 0x20);
}

6
src/pause_game.c
View File

@ -5,7 +5,7 @@
extern const struct Vector16 gUnknown_08137D78[];
extern const u16 gUnknown_08137DA4[];
extern const u8 gUnknown_08510CAC[][0x20];
extern const u8 gPauseMenuText_Gfx[][0x20];
// Pauses the game and saves the blend settings
@ -242,11 +242,11 @@ void sub_49A34(void)
index = gUnknown_08137DA4[(gMain.systemFrameCount % 65) / 5];
if (gMain.selectedField < MAIN_FIELD_COUNT)
{
DmaCopy16(3, gUnknown_08510CAC[index], (void *)0x060118C0, 0x20);
DmaCopy16(3, gPauseMenuText_Gfx[index], (void *)0x060118C0, 0x20);
}
else
{
DmaCopy16(3, gUnknown_08510CAC[index], (void *)0x06010480, 0x20);
DmaCopy16(3, gPauseMenuText_Gfx[index], (void *)0x06010480, 0x20);
}
offsets = gUnknown_08137D78;

30
src/pinball_game_main.c
View File

@ -42,20 +42,20 @@ extern const u8 gUnknown_083FFD4C[0x40];
extern const u8 gUnknown_08480E0C[][0x40];
extern const u8 gUnknown_084F61EC[];
extern const u8 gUnknown_084FA20C[];
extern const u8 gUnknown_0850100C[];
extern const u8 gUnknown_0850398C[];
extern const u8 gUnknown_08526DCC[];
extern const u8 gMainBoardBallSave_Gfx[];
extern const u8 gMainBoardEndOfBall_Gfx[];
extern const u8 gSapphireBoardZigzagoonFx_Gfx[];
extern const s16 gUnknown_086ACFE0[];
extern const u16 gUnknown_086AD2DE[];
extern const u8 *gUnknown_086AD474[];
extern const s16 gUnknown_086AD456[][7];
extern const u8 gUnknown_084FB68C[][0x480];
extern const u8 gRubyBoardHatchCave_Gfx[][0x480];
extern const u8 gUnknown_083C3C2C[][0x300];
extern const u8 gUnknown_084F5ACC[][0x260];
extern const u8 gRubyBoardSharpedo_Gfx[][0x260];
extern const u8 gUnknown_083C806C[][0x100];
extern const u8 gUnknown_084ED0CC[][0x180];
extern const u8 gRubyBoardShopDoor_Gfx[][0x180];
extern const u8 gUnknown_08449D8C[][0x280];
extern const u8 gUnknown_084F6B0C[][0x500];
extern const u8 gRubyBoardShop_Gfx[][0x500];
extern const u8 gUnknown_08490A4C[][0x440];
extern const s16 gUnknown_086AE5A0[][2];
extern const u8 gKecleonBonusClear_Gfx[0x2000];
@ -1331,10 +1331,10 @@ void sub_4BC34(void)
}
break;
case 18:
DmaCopy16(3, gUnknown_0850100C, (void *)0x6015800, 0x2400);
DmaCopy16(3, gMainBoardBallSave_Gfx, (void *)0x6015800, 0x2400);
break;
case 19:
DmaCopy16(3, gUnknown_0850398C, (void *)0x6015800, 0x2800);
DmaCopy16(3, gMainBoardEndOfBall_Gfx, (void *)0x6015800, 0x2800);
break;
case 20:
if (gMain.selectedField == FIELD_RUBY)
@ -1349,7 +1349,7 @@ void sub_4BC34(void)
}
break;
case 21:
DmaCopy16(3, gUnknown_08526DCC, (void *)0x6015800, 0xC00);
DmaCopy16(3, gSapphireBoardZigzagoonFx_Gfx, (void *)0x6015800, 0xC00);
break;
}
}
@ -1377,7 +1377,7 @@ void sub_4C290(void)
}
var0 = gCurrentPinballGame->unk1E5;
DmaCopy16(3, gUnknown_084FA48C[var0 = gCurrentPinballGame->unk1E5], 0x06010780, 0x120);
DmaCopy16(3, gMainBoardPikaSpinner_Gfx[var0 = gCurrentPinballGame->unk1E5], 0x06010780, 0x120);
var0 = gCurrentPinballGame->unk1CA;
DmaCopy16(3, gUnknown_084C00EC[var0], 0x06010AE0, 0x80);
@ -1502,15 +1502,15 @@ void sub_4C808(void)
s16 var0;
var0 = gUnknown_086AD2EE[gCurrentPinballGame->unk1ED][2];
DmaCopy16(3, gUnknown_084FB68C[var0], (void *)0x60122A0, 0x480);
DmaCopy16(3, gRubyBoardHatchCave_Gfx[var0], (void *)0x60122A0, 0x480);
var0 = (gMain.systemFrameCount % 50) / 25;
DmaCopy16(3, gUnknown_083C3C2C[var0], (void *)0x6012720, 0x300);
DmaCopy16(3, gUnknown_084F5ACC[gCurrentPinballGame->unk2F5], (void *)0x6012C20, 0x260);
DmaCopy16(3, gRubyBoardSharpedo_Gfx[gCurrentPinballGame->unk2F5], (void *)0x6012C20, 0x260);
for (i = 0; i < 2; i++)
DmaCopy16(3, gUnknown_083C806C[var0], (void *)0x6010000 + (0x174 + i * 8) * 0x20, 0x100);
var0 = gCurrentPinballGame->unk2F1 & 0xF;
DmaCopy16(3, gUnknown_084ED0CC[var0], (void *)0x6013180, 0x180);
DmaCopy16(3, gRubyBoardShopDoor_Gfx[var0], (void *)0x6013180, 0x180);
if (gCurrentPinballGame->unk2DA < 3)
gCurrentPinballGame->unk746 = 0;
else
@ -1518,7 +1518,7 @@ void sub_4C808(void)
DmaCopy16(3, gUnknown_08449D8C[gCurrentPinballGame->unk746], (void *)0x6013300, 0x280);
var0 = gUnknown_086AD456[gCurrentPinballGame->unk1A5][(gCurrentPinballGame->unk1B4 % 42) / 6];
DmaCopy16(3, gUnknown_084F6B0C[var0], (void *)0x6013D00, 0x500);
DmaCopy16(3, gRubyBoardShop_Gfx[var0], (void *)0x6013D00, 0x500);
}
void sub_4CA18(void)

14
src/rom_201B8.c
View File

@ -13,9 +13,9 @@ extern const s16 gUnknown_086ADA58[];
extern const u8 gUnknown_083C3C2C[][0x300];
extern const u8 gUnknown_083C562C[][0x100];
extern const u8 gUnknown_083C542C[][0x80];
extern const u8 gUnknown_084F5ACC[][0x260];
extern const u8 gRubyBoardSharpedo_Gfx[][0x260];
extern const s16 gUnknown_086AD9FC[][2];
extern const u16 gUnknown_086B3A04[42][3][3];
extern const u16 gSharpedoSpritesheetOam[42][3][3];
extern const u8 gUnknown_083C806C[][0x100];
extern const u8 gUnknown_0844928C[][0x100];
extern const u8 gUnknown_08137998[];
@ -27,7 +27,7 @@ extern const s16 gUnknown_086AD9EC[];
extern const s16 gUnknown_0813798C[];
extern const u8 gUnknown_081379D8[];
extern const u8 gUnknown_084B7FEC[][0x480];
extern const u8 gUnknown_084ED0CC[][0x180];
extern const u8 gRubyBoardShopDoor_Gfx[][0x180];
extern const s16 gUnknown_086AD7C0[50][3];
extern const s16 gUnknown_086AD856[][2];
extern const u8 gUnknown_0845710C[][0x280];
@ -553,7 +553,7 @@ void sub_1DAD8(void)
gCurrentPinballGame->unk2F2 = 4;
}
DmaCopy16(3, gUnknown_084ED0CC[gCurrentPinballGame->unk2F1], (void *)0x06013180, 0x180);
DmaCopy16(3, gRubyBoardShopDoor_Gfx[gCurrentPinballGame->unk2F1], (void *)0x06013180, 0x180);
}
}
@ -1205,7 +1205,7 @@ void sub_1F158(void)
index = (gMain.systemFrameCount % 55) / 11;
group = &gMain.spriteGroups[61];
DmaCopy16(3, gUnknown_084F5ACC[gCurrentPinballGame->unk2F5], (void *)0x06012C20, 0x260);
DmaCopy16(3, gRubyBoardSharpedo_Gfx[gCurrentPinballGame->unk2F5], (void *)0x06012C20, 0x260);
if (gCurrentPinballGame->unk2F4)
index = gCurrentPinballGame->unk2F4;
@ -1217,7 +1217,7 @@ void sub_1F158(void)
{
oamSimple = &group->oam[i];
dst = (u16*)&gOamBuffer[oamSimple->oamId];
src = gUnknown_086B3A04[var0][i];
src = gSharpedoSpritesheetOam[var0][i];
*dst++ = *src++;
*dst++ = *src++;
*dst++ = *src++;
@ -1357,7 +1357,7 @@ void sub_1F59C(void)
if (gCurrentPinballGame->unk1E5 != gCurrentPinballGame->unk1E6)
{
gCurrentPinballGame->unk1E6 = gCurrentPinballGame->unk1E5;
DmaCopy16(3, gUnknown_084FA48C[index], (void *)0x06010780, 0x120);
DmaCopy16(3, gMainBoardPikaSpinner_Gfx[index], (void *)0x06010780, 0x120);
}
for (i = 0; i < 4; i++)

8
src/rom_27E08.c
View File

@ -48,7 +48,7 @@ extern const u16 gUnknown_086B4B0E[48][4][3];
extern const u16 gUnknown_086AE0B4[];
extern const struct Vector16 gUnknown_086AE0A4[];
extern const u8 gUnknown_08449D8C[][0x280];
extern const u8 gUnknown_084FB68C[][0x480];
extern const u8 gRubyBoardHatchCave_Gfx[][0x480];
extern const u16 gUnknown_086B4D4E[40][2][3];
extern const u8 gUnknown_083FFD4C[][0x40];
extern const u8 gUnknown_083FF04C[][0x40];
@ -68,7 +68,7 @@ extern const s16 gUnknown_086ADFD4[];
extern const u8 gUnknown_0847FF0C[][0x300];
extern const u8 gUnknown_08480E0C[][0x40];
extern const s16 gUnknown_086AD456[][7];
extern const u8 gUnknown_084F6B0C[][0x500];
extern const u8 gRubyBoardShop_Gfx[][0x500];
extern const u8 gUnknown_083A8A8C[];
extern const struct Vector32 gUnknown_086ADF90[];
extern const u8 gUnknown_084C156C[];
@ -658,7 +658,7 @@ void sub_21D78(void)
if (gCurrentPinballGame->unk1B4 % 6 == 0)
{
DmaCopy16(3, gUnknown_084F6B0C[index], (void *)0x06013D00, 0x500);
DmaCopy16(3, gRubyBoardShop_Gfx[index], (void *)0x06013D00, 0x500);
}
group->baseX = 181 - gCurrentPinballGame->unk58;
@ -1447,7 +1447,7 @@ void sub_239A4(void)
if (gCurrentPinballGame->unk1EE != gCurrentPinballGame->unk1ED)
{
index = gUnknown_086AD2EE[gCurrentPinballGame->unk1ED][2];
DmaCopy16(3, gUnknown_084FB68C[index], (void *)0x060122A0, 0x480);
DmaCopy16(3, gRubyBoardHatchCave_Gfx[index], (void *)0x060122A0, 0x480);
index = gUnknown_086AD2EE[gCurrentPinballGame->unk1ED][3];
DmaCopy16(3, gUnknown_084FD18C[index], (void *)0x06011CE0, 0x200);
gCurrentPinballGame->unk1EE = gCurrentPinballGame->unk1ED;

4
src/rom_2C538.c
View File

@ -4,7 +4,7 @@
#include "constants/bg_music.h"
extern const u8 gUnknown_0847DF0C[][0x300];
extern const u8 gUnknown_084FEF0C[][0x80];
extern const u8 gRubyBoardRampPrize_Gfx[][0x80];
void sub_2C538(void)
@ -168,7 +168,7 @@ void sub_2C9A4(void)
else
index = (gCurrentPinballGame->unk290 % 32) / 8;
DmaCopy16(3, gUnknown_084FEF0C[index], (void *) 0x06014B00, 0x80);
DmaCopy16(3, gRubyBoardRampPrize_Gfx[index], (void *) 0x06014B00, 0x80);
oamSimple = &group->oam[0];
gOamBuffer[oamSimple->oamId].x = oamSimple->xOffset + group->baseX;
gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY;

24
src/rom_2E67C.c
View File

@ -9,12 +9,12 @@ extern const s8 gUnknown_08137CBC[][2];
extern const u8 gUnknown_084BB16C[][0x480];
extern const u16 gUnknown_086B3EF6[20][4][3];
extern const s16 gUnknown_086AE462[][2];
extern const u8 gUnknown_083FFD8C[][0x300];
extern const u16 gUnknown_086B4A72[26][2][3];
extern const u8 gUnknown_08526DCC[];
extern const u8 gSapphireBoardWailmer_Gfx[][0x300];
extern const u16 gWailmerSpritesheetOam[26][2][3];
extern const u8 gSapphireBoardZigzagoonFx_Gfx[];
extern const s16 gUnknown_086AE496[][3];
extern const u8 gUnknown_08512C4C[][0x380];
extern const u16 gUnknown_086B3CA4[42][3][3];
extern const u8 gSapphireBoardZigzagoon_Gfx[][0x380];
extern const u16 gSapphireBoardZigzagoonSpritesheetOam[42][3][3];
extern const u16 gUnknown_086B3B7E[14][7][3];
extern const u8 gUnknown_084ED6CC[][0x200];
extern const s16 gUnknown_086AE4FC[][2];
@ -23,7 +23,7 @@ extern const u8 gUnknown_0847A40C[][0x300];
extern const u8 gUnknown_0847D10C[][0x200];
extern const u8 gUnknown_084C1E6C[][0x300];
extern const u8 gUnknown_084C4B6C[][0x200];
extern const u8 gUnknown_084FEA0C[][0x80];
extern const u8 gSapphireBoardShopShockWall_Gfx[][0x80];
extern const u8 gUnknown_0845690C[][0x200];
extern const u8 gUnknown_08483D8C[][0x480];
extern const u8 gUnknown_08488A0C[][0x480];
@ -1211,12 +1211,12 @@ void sub_2F140(void)
index = gUnknown_086AE462[index][1];
group->baseX = 164 - gCurrentPinballGame->unk58;
group->baseY = 166 - gCurrentPinballGame->unk5A;
DmaCopy16(3, gUnknown_083FFD8C[index], (void *)0x06012720, 0x300);
DmaCopy16(3, gSapphireBoardWailmer_Gfx[index], (void *)0x06012720, 0x300);
for (i = 0; i < 2; i++)
{
oamSimple = &group->oam[i];
dst = (u16*)&gOamBuffer[oamSimple->oamId];
src = gUnknown_086B4A72[var0][i];
src = gWailmerSpritesheetOam[var0][i];
*dst++ = *src++;
*dst++ = *src++;
*dst++ = *src++;
@ -1271,7 +1271,7 @@ void sub_2F26C(void)
gCurrentPinballGame->unk37B = 0;
gMain.spriteGroups[27].available = 1;
gCurrentPinballGame->unkE4 = 22;
DmaCopy16(3, gUnknown_08526DCC, (void *)0x06015800, 0xC00);
DmaCopy16(3, gSapphireBoardZigzagoonFx_Gfx, (void *)0x06015800, 0xC00);
m4aSongNumStart(SE_UNKNOWN_0xEC);
gCurrentPinballGame->scoreAddedInFrame = 5000;
break;
@ -1321,13 +1321,13 @@ void sub_2F504(void)
group->baseX = 198 - gCurrentPinballGame->unk58;
group->baseY = gCurrentPinballGame->unk380 + 284 - gCurrentPinballGame->unk5A;
index = gCurrentPinballGame->unk379;
DmaCopy16(3, gUnknown_08512C4C[index], (void *)0x06012A20, 0x380);
DmaCopy16(3, gSapphireBoardZigzagoon_Gfx[index], (void *)0x06012A20, 0x380);
index = gCurrentPinballGame->unk37A;
for (i = 0; i < 3; i++)
{
oamSimple = &group->oam[i];
dst = (u16*)&gOamBuffer[oamSimple->oamId];
src = gUnknown_086B3CA4[index][i];
src = gSapphireBoardZigzagoonSpritesheetOam[index][i];
*dst++ = *src++;
*dst++ = *src++;
*dst++ = *src++;
@ -1671,7 +1671,7 @@ void sub_2FCD0(void)
else
index = 9;
DmaCopy16(3, &gUnknown_084FEA0C[index], (void *)0x060146A0, 0x80);
DmaCopy16(3, &gSapphireBoardShopShockWall_Gfx[index], (void *)0x060146A0, 0x80);
oamSimple = &group->oam[0];
gOamBuffer[oamSimple->oamId].x = oamSimple->xOffset + group->baseX;
gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY;

8
src/rom_30480.c
View File

@ -6,9 +6,9 @@
extern const u16 gUnknown_086B4D4E[40][2][3];
extern const u16 gUnknown_086AE54A[];
extern const u8 gUnknown_0844F20C[][0x280];
extern const u8 gUnknown_084FDF8C[][0x180];
extern const u8 gSapphireBoardSeedot_Gfx[][0x180];
extern const u16 gUnknown_086AE544[];
extern const u16 gUnknown_086B3E1E[6][6][2][3];
extern const u16 gSapphireBoardSeedotSpritesheetOam[6][6][2][3];
extern const u16 gUnknown_08137D06[][14];
extern const u16 gUnknown_08137CF6[][4];
extern const u16 gUnknown_08137CE2[][5];
@ -415,13 +415,13 @@ void sub_30EB4(void)
else
group->baseY = 200;
DmaCopy16(3, gUnknown_084FDF8C[gCurrentPinballGame->unk32F[j]], (void *)0x06013C20 + j * 0x180, 0x160);
DmaCopy16(3, gSapphireBoardSeedot_Gfx[gCurrentPinballGame->unk32F[j]], (void *)0x06013C20 + j * 0x180, 0x160);
index = gCurrentPinballGame->unk332[j];
for (i = 0; i < 2; i++)
{
oamSimple = &group->oam[i];
dst = (u16*)&gOamBuffer[oamSimple->oamId];
src = gUnknown_086B3E1E[j][index][i];
src = gSapphireBoardSeedotSpritesheetOam[j][index][i];
*dst++ = *src++;
*dst++ = *src++;
*dst++ = *src++;