pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-18 00:42:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Build main segment in JP (#939)

Browse Source 
* Remove JP dump

* Add new JP dump

* Fix sort_symbol_addrs to only look at one version

* Deduplicate and sort symbol_addrs

* Clean up JP rom if conditions

* Use /current dir for diffing

* Fix state_step_logos

* Add todo comments for unsplitted segments

* Fix draw_merlee_message

* rename background_gfx

* Fix background_gfx

* Fix JP build

* Set unused data offsets to auto
This commit is contained in:
Marijn van der Werf 2023-02-17 03:06:56 +01:00 committed by GitHub
parent 8e671e2fff
commit 0d70e3ecac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1539 changed files with 11045 additions and 92909 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
diff.py
View File

@ -1340,7 +1340,7 @@ def dump_objfile(
if not os.path.isfile(objfile):
fail(f"Not able to find .o file for function: {objfile} is not a file.")
refobjfile = "ver/us/expected/" + objfile
refobjfile = "ver/current/expected/" + objfile
if not os.path.isfile(refobjfile):
fail(f'Please ensure an OK .o file exists at "{refobjfile}".')

8
include/common_structs.h
View File

@ -2201,11 +2201,17 @@ typedef struct {
/* 0x1D */ char unk_1D[3];
} Window; // size = 0x20
#if VERSION_JP
#define DISPLAYCONTEXT_GFX_COUNT 0x2000
#else
#define DISPLAYCONTEXT_GFX_COUNT 0x2080
#endif
typedef struct {
/* 0x00000 */ LookAt lookAt;
/* 0x00020 */ Hilite hilite;
/* 0x00030 */ Mtx camPerspMatrix[8]; // could only be length 4, unsure
/* 0x00230 */ Gfx mainGfx[0x2080];
/* 0x00230 */ Gfx mainGfx[DISPLAYCONTEXT_GFX_COUNT];
/* 0x10630 */ Gfx backgroundGfx[0x200]; // used by gfx_task_background
/* 0x11630 */ Mtx matrixStack[0x200];
} DisplayContext; // size = 0x19630

6
include/rumble.h Normal file
View File

@ -0,0 +1,6 @@
#ifndef _RUMBLE_H_
#define _RUMBLE_H_
void reset_max_rumble_duration(void);
#endif

179
src/5B320.c
View File

@ -3,6 +3,173 @@
#include "item_entity.h"
#include "world/world.h"
#if !VERSION_JP
#define MSG_FullDesc_32 0
#define MSG_ItemFullDesc_AutoJump 0
#define MSG_ItemFullDesc_AutoMultibounce 0
#define MSG_ItemFullDesc_AutoSmash 0
#define MSG_ItemFullDesc_Berserker 0
#define MSG_ItemFullDesc_CrazyHeart 0
#define MSG_ItemFullDesc_EarthquakeJump 0
#define MSG_ItemFullDesc_FlowerFanatic 0
#define MSG_ItemFullDesc_ForestPass 0
#define MSG_ItemFullDesc_HealthyHealthy 0
#define MSG_ItemFullDesc_HustleDrink 0
#define MSG_ItemFullDesc_InsecticideHerb 0
#define MSG_ItemFullDesc_JumpCharge0 0
#define MSG_ItemFullDesc_Kaiden 0
#define MSG_ItemFullDesc_KootAltPhoto 0
#define MSG_ItemFullDesc_KootShell 0
#define MSG_ItemFullDesc_MegaHPDrain 0
#define MSG_ItemFullDesc_MysteryScroll 0
#define MSG_ItemFullDesc_PleaseComeBack 0
#define MSG_ItemFullDesc_Screwdriver 0
#define MSG_ItemFullDesc_ShellCrack 0
#define MSG_ItemFullDesc_SmashCharge0 0
#define MSG_ItemFullDesc_SuperFocus 0
#define MSG_ItemFullDesc_SuperJump 0
#define MSG_ItemFullDesc_SuperSmash 0
#define MSG_ItemFullDesc_SuspiciousNote 0
#define MSG_ItemFullDesc_ToadDoll 0
#define MSG_ItemFullDesc_UnusedLetter 0
#define MSG_ItemFullDesc_UnusedLetter02 0
#define MSG_ItemFullDesc_UnusedLetter03 0
#define MSG_ItemFullDesc_UnusedLetter04 0
#define MSG_ItemFullDesc_UnusedLetter05 0
#define MSG_ItemFullDesc_UnusedLetter06 0
#define MSG_ItemName_Heart 0
#define MSG_ItemName_Coin 0
#define MSG_ItemName_HeartPiece 0
#define MSG_ItemName_StarPoint 0
#define MSG_ItemName_HeartPoint 0
#define MSG_ItemName_FlowerPoint 0
#define MSG_ItemName_Map 0
#define MSG_ItemName_BigMap 0
#define MSG_ItemName_AutoJump 0
#define MSG_ItemName_AutoMultibounce 0
#define MSG_ItemName_AutoSmash 0
#define MSG_ItemName_Berserker 0
#define MSG_ItemName_CrazyHeart 0
#define MSG_ItemName_EarthquakeJump 0
#define MSG_ItemName_FlowerFanatic 0
#define MSG_ItemName_ForestPass 0
#define MSG_ItemName_HealthyHealthy 0
#define MSG_ItemName_HustleDrink 0
#define MSG_ItemName_InsecticideHerb 0
#define MSG_ItemName_JumpCharge0 0
#define MSG_ItemName_Kaiden 0
#define MSG_ItemName_KootAltPhoto 0
#define MSG_ItemName_KootShell 0
#define MSG_ItemName_MegaHPDrain 0
#define MSG_ItemName_MysteryScroll 0
#define MSG_ItemName_PleaseComeBack 0
#define MSG_ItemName_Screwdriver 0
#define MSG_ItemName_ShellCrack 0
#define MSG_ItemName_SmashCharge0 0
#define MSG_ItemName_SuperFocus 0
#define MSG_ItemName_SuperJump 0
#define MSG_ItemName_SuperSmash 0
#define MSG_ItemName_SuspiciousNote 0
#define MSG_ItemName_ToadDoll 0
#define MSG_ItemName_UnusedLetter 0
#define MSG_ItemName_UnusedLetter02 0
#define MSG_ItemName_UnusedLetter03 0
#define MSG_ItemName_UnusedLetter04 0
#define MSG_ItemName_UnusedLetter05 0
#define MSG_ItemName_UnusedLetter06 0
#define MSG_ItemShortDesc_AutoJump 0
#define MSG_ItemShortDesc_AutoMultibounce 0
#define MSG_ItemShortDesc_AutoSmash 0
#define MSG_ItemShortDesc_Berserker 0
#define MSG_ItemShortDesc_CrazyHeart 0
#define MSG_ItemShortDesc_EarthquakeJump 0
#define MSG_ItemShortDesc_FlowerFanatic 0
#define MSG_ItemShortDesc_ForestPass 0
#define MSG_ItemShortDesc_HealthyHealthy 0
#define MSG_ItemShortDesc_HustleDrink 0
#define MSG_ItemShortDesc_InsecticideHerb 0
#define MSG_ItemShortDesc_JumpCharge0 0
#define MSG_ItemShortDesc_Kaiden 0
#define MSG_ItemShortDesc_KootAltPhoto 0
#define MSG_ItemShortDesc_KootShell 0
#define MSG_ItemShortDesc_MegaHPDrain 0
#define MSG_ItemShortDesc_MysteryScroll 0
#define MSG_ItemShortDesc_PleaseComeBack 0
#define MSG_ItemShortDesc_Screwdriver 0
#define MSG_ItemShortDesc_ShellCrack 0
#define MSG_ItemShortDesc_SmashCharge0 0
#define MSG_ItemShortDesc_SuperFocus 0
#define MSG_ItemShortDesc_SuperJump 0
#define MSG_ItemShortDesc_SuperSmash 0
#define MSG_ItemShortDesc_SuspiciousNote 0
#define MSG_ItemShortDesc_ToadDoll 0
#define MSG_ItemShortDesc_UnusedLetter 0
#define MSG_ItemShortDesc_UnusedLetter02 0
#define MSG_ItemShortDesc_UnusedLetter03 0
#define MSG_ItemShortDesc_UnusedLetter04 0
#define MSG_ItemShortDesc_UnusedLetter05 0
#define MSG_ItemShortDesc_UnusedLetter06 0
#define MSG_MoveName_32 0
#define MSG_MoveName_AutoJump 0
#define MSG_MoveName_AutoMultibounce 0
#define MSG_MoveName_AutoSmash 0
#define MSG_MoveName_Berserker 0
#define MSG_MoveName_BumpAttack 0
#define MSG_MoveName_CloseCall 0
#define MSG_MoveName_CrazyHeart 0
#define MSG_MoveName_DefendPlus 0
#define MSG_MoveName_DizzyAttack 0
#define MSG_MoveName_EarthquakeJump 0
#define MSG_MoveName_FlowerFanatic 0
#define MSG_MoveName_FlowerFinder 0
#define MSG_MoveName_HealthyHealthy 0
#define MSG_MoveName_HeartFinder 0
#define MSG_MoveName_ISpy 0
#define MSG_MoveName_JumpCharge0 0
#define MSG_MoveName_LastStand 0
#define MSG_MoveName_LuckyDay 0
#define MSG_MoveName_MegaHPDrain 0
#define MSG_MoveName_PowerRush 0
#define MSG_MoveName_SmashCharge0 0
#define MSG_MoveName_SpeedySpin 0
#define MSG_MoveName_SpinAttack 0
#define MSG_MoveName_SuperJump 0
#define MSG_MoveName_SuperSmash 0
#define MSG_PartnerDesc_Goombaria_Battle 0
#define MSG_PartnerDesc_Goombaria_World 0
#define MSG_PartnerDesc_Goompa_Battle 0
#define MSG_PartnerDesc_Goompa_World 0
#define MSG_PartnerDesc_Twink_Battle 0
#define MSG_PartnerDesc_Twink_World 0
#define MSG_ShortDesc_32 0
// Use generic names for the different levels of partner moves
#define MSG_PartnerMoveName_BellyFlop1 MSG_PartnerMoveName_BellyFlop
#define MSG_PartnerMoveName_BellyFlop2 MSG_PartnerMoveName_BellyFlop
#define MSG_PartnerMoveName_BellyFlop3 MSG_PartnerMoveName_BellyFlop
#define MSG_PartnerMoveName_BodySlam1 MSG_PartnerMoveName_BodySlam
#define MSG_PartnerMoveName_BodySlam2 MSG_PartnerMoveName_BodySlam
#define MSG_PartnerMoveName_BodySlam3 MSG_PartnerMoveName_BodySlam
#define MSG_PartnerMoveName_ElectroDash1 MSG_PartnerMoveName_ElectroDash
#define MSG_PartnerMoveName_ElectroDash2 MSG_PartnerMoveName_ElectroDash
#define MSG_PartnerMoveName_ElectroDash3 MSG_PartnerMoveName_ElectroDash
#define MSG_PartnerMoveName_Headbonk1 MSG_PartnerMoveName_Headbonk
#define MSG_PartnerMoveName_Headbonk2 MSG_PartnerMoveName_Headbonk
#define MSG_PartnerMoveName_Headbonk3 MSG_PartnerMoveName_Headbonk
#define MSG_PartnerMoveName_ShellToss1 MSG_PartnerMoveName_ShellToss
#define MSG_PartnerMoveName_ShellToss2 MSG_PartnerMoveName_ShellToss
#define MSG_PartnerMoveName_ShellToss3 MSG_PartnerMoveName_ShellToss
#define MSG_PartnerMoveName_SkyDive1 MSG_PartnerMoveName_SkyDive
#define MSG_PartnerMoveName_SkyDive2 MSG_PartnerMoveName_SkyDive
#define MSG_PartnerMoveName_SkyDive3 MSG_PartnerMoveName_SkyDive
#define MSG_PartnerMoveName_Smack1 MSG_PartnerMoveName_Smack
#define MSG_PartnerMoveName_Smack2 MSG_PartnerMoveName_Smack
#define MSG_PartnerMoveName_Smack3 MSG_PartnerMoveName_Smack
#define MSG_PartnerMoveName_SpinyFlip1 MSG_PartnerMoveName_SpinyFlip
#define MSG_PartnerMoveName_SpinyFlip2 MSG_PartnerMoveName_SpinyFlip
#define MSG_PartnerMoveName_SpinyFlip3 MSG_PartnerMoveName_SpinyFlip
#endif
#define STANDARD_ITEM_SCRIPT(icon) \
{ \
is_SetIcon(60, icon) \
@ -193,8 +360,8 @@ PartnerPopupProperties gPartnerPopupProperties[] = {
[PARTNER_GOOMPA] {
MSG_Menus_Party_Goompa,
0x00000001,
0x00000000,
0x00000000,
MSG_PartnerDesc_Goompa_World,
MSG_PartnerDesc_Goompa_Battle,
},
[PARTNER_WATT] {
MSG_Menus_Party_Watt,
@ -223,14 +390,14 @@ PartnerPopupProperties gPartnerPopupProperties[] = {
[PARTNER_GOOMBARIA] {
MSG_Menus_Party_Goombaria,
0x00000001,
0x00000000,
0x00000000,
MSG_PartnerDesc_Goombaria_World,
MSG_PartnerDesc_Goombaria_Battle,
},
[PARTNER_TWINK] {
MSG_Menus_Party_Twink,
0x00000001,
0x00000000,
0x00000000,
MSG_PartnerDesc_Twink_World,
MSG_PartnerDesc_Twink_Battle,
}
};

2
src/audio/2e230_len_2190.c
View File

@ -10,6 +10,8 @@ extern f32 AlTuneScaling[];
#ifdef SHIFT
#define SBN_ROM_OFFSET SBN_ROM_START
#elif VERSION_JP
#define SBN_ROM_OFFSET 0xFC0000
#else
#define SBN_ROM_OFFSET 0xF00000
#endif

492
src/background_gfx.c Normal file
View File

@ -0,0 +1,492 @@
#include "common.h"
#include "nu/nusys.h"
#include "ld_addrs.h"
#include "hud_element.h"
#include "sprite.h"
#include "overlay.h"
extern s32 gPauseBackgroundFade;
Vp D_80074200 = {
.vp = {
.vscale = {640, 480, 511, 0},
.vtrans = {640, 480, 511, 0},
}
};
Gfx D_80074210[] = {
gsDPSetRenderMode(G_RM_OPA_SURF, G_RM_OPA_SURF2),
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsDPSetColorDither(G_CD_BAYER),
gsSPEndDisplayList(),
};
Gfx D_80074230[] = {
gsSPViewport(&D_80074200),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH | G_CLIPPING | 0x0040F9FA),
gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH),
gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_OFF),
gsSPEndDisplayList(),
};
//extern s32 timeFreezeMode; // TODO bss
void gfx_init_state(void) {
gSPSegment(gMasterGfxPos++, 0x00, 0x0);
gSPDisplayList(gMasterGfxPos++, OS_K0_TO_PHYSICAL(D_80074230));
gSPDisplayList(gMasterGfxPos++, OS_K0_TO_PHYSICAL(D_80074210));
}
s32 gfx_frame_filter_pass_0(const u16* frameBuffer0, const u16* frameBuffer1, s32 y, s32 x, Color_RGBA8* out) {
s32 pixel = SCREEN_WIDTH * y + x;
out->a = (frameBuffer1[pixel] >> 2) & 0xF;
out->r = (frameBuffer0[pixel] >> 11);
out->g = (frameBuffer0[pixel] >> 6) & 0x1F;
out->b = (frameBuffer0[pixel] >> 1) & 0x1F;
}
void gfx_frame_filter_pass_1(Color_RGBA8* filterBuf0, Color_RGBA8 filterBuf1, u16* out) {
Color_RGBA8 sp0;
Color_RGBA8 sp8;
Color_RGBA8 final;
u8 rs[0x20];
u8 gs[0x20];
u8 bs[0x20];
s32 i;
sp8 = filterBuf1;
sp0 = filterBuf1;
for (i = 0; i < ARRAY_COUNT(rs); i++) {
rs[i] = 0;
gs[i] = 0;
bs[i] = 0;
}
for (i = 0; i < 6; i++) {
if (filterBuf0[i].a == 8) {
rs[filterBuf0[i].r]++;
gs[filterBuf0[i].g]++;
bs[filterBuf0[i].b]++;
}
}
for (i = 0; i < ARRAY_COUNT(rs); i++) {
if (rs[i] != 0) {
rs[i]--;
break;
}
}
for (; i < ARRAY_COUNT(rs); i++) {
if (rs[i] != 0) {
break;
}
}
if (sp0.r > i) {
sp0.r = i;
}
for (i = 0; i < ARRAY_COUNT(gs); i++) {
if (gs[i] != 0) {
gs[i]--;
break;
}
}
for (; i < ARRAY_COUNT(gs); i++) {
if (gs[i] != 0) {
break;
}
}
if (sp0.g > i) {
sp0.g = i;
}
for (i = 0; i < ARRAY_COUNT(bs); i++) {
if (bs[i] != 0) {
bs[i]--;
break;
}
}
for (; i < ARRAY_COUNT(bs); i++) {
if (bs[i] != 0) {
break;
}
}
if (sp0.b > i) {
sp0.b = i;
}
for (i = ARRAY_COUNT(rs) - 1; i >= 0; i--) {
if (rs[i] != 0) {
break;
}
}
if (sp8.r < i) {
sp8.r = i;
}
for (i = ARRAY_COUNT(gs) - 1; i >= 0; i--) {
if (gs[i] != 0) {
break;
}
}
if (sp8.g < i) {
sp8.g = i;
}
for (i = ARRAY_COUNT(bs) - 1; i >= 0; i--) {
if (bs[i] != 0) {
break;
}
}
if (sp8.b < i) {
sp8.b = i;
}
final.r = (sp8.r + sp0.r) - filterBuf1.r;
final.g = (sp8.g + sp0.g) - filterBuf1.g;
final.b = (sp8.b + sp0.b) - filterBuf1.b;
final.r = ((filterBuf1.r * filterBuf1.a) + (final.r * (8 - filterBuf1.a))) >> 3;
final.g = ((filterBuf1.g * filterBuf1.a) + (final.g * (8 - filterBuf1.a))) >> 3;
final.b = ((filterBuf1.b * filterBuf1.a) + (final.b * (8 - filterBuf1.a))) >> 3;
*out = (final.r << 11) + (final.g << 6) + (final.b << 1) + 1;
}
void func_80027600(Color_RGBA8* arg0, s16* out) {
Color_RGBA8 final;
u8 rs[0x20];
u8 gs[0x20];
u8 bs[0x20];
s32 i;
s32 sum;
for (i = 0; i < ARRAY_COUNT(rs); i++) {
rs[i] = 0;
gs[i] = 0;
bs[i] = 0;
}
for (i = 0; i < 9; i++) {
rs[arg0[i].r]++;
gs[arg0[i].g]++;
bs[arg0[i].b]++;
}
sum = 0;
for (i = 0; i < ARRAY_COUNT(rs); i++) {
sum += rs[i];
if (sum >= 5) {
break;
}
}
final.r = i;
sum = 0;
for (i = 0; i < ARRAY_COUNT(gs); i++) {
sum += gs[i];
if (sum >= 5) {
break;
}
}
final.g = i;
sum = 0;
for (i = 0; i < ARRAY_COUNT(bs); i++) {
sum += bs[i];
if (sum >= 5) {
break;
}
}
final.b = i;
*out = (final.r << 11) + (final.g << 6) + (final.b << 1) + 1;
}
void func_80027774(u16* frameBuffer0, u16* frameBuffer1, u16* zBuffer) {
Color_RGBA8 filterBuf0[9];
s32 x, y;
for (y = 1; y < SCREEN_HEIGHT - 1; y++) {
for (x = 1; x < SCREEN_WIDTH - 1; x++) {
/*
The application of gfx_frame_filter_pass_0 is done to the following pixels, where x is the current pixel.
...
.x.
...
*/
if (
(((frameBuffer1[(SCREEN_WIDTH * y) + x - 1] >> 2) & 0xF) < 8) ||
(((frameBuffer1[(SCREEN_WIDTH * y) + x + 0] >> 2) & 0xF) < 8) ||
(((frameBuffer1[(SCREEN_WIDTH * y) + x + 1] >> 2) & 0xF) < 8))
{
gfx_frame_filter_pass_0(frameBuffer0, frameBuffer1, y - 1, x - 1, &filterBuf0[0]);
gfx_frame_filter_pass_0(frameBuffer0, frameBuffer1, y - 1, x, &filterBuf0[1]);
gfx_frame_filter_pass_0(frameBuffer0, frameBuffer1, y - 1, x + 1, &filterBuf0[2]);
gfx_frame_filter_pass_0(frameBuffer0, frameBuffer1, y , x - 1, &filterBuf0[3]);
gfx_frame_filter_pass_0(frameBuffer0, frameBuffer1, y , x, &filterBuf0[4]);
gfx_frame_filter_pass_0(frameBuffer0, frameBuffer1, y , x + 1, &filterBuf0[5]);
gfx_frame_filter_pass_0(frameBuffer0, frameBuffer1, y + 1, x - 1, &filterBuf0[6]);
gfx_frame_filter_pass_0(frameBuffer0, frameBuffer1, y + 1, x, &filterBuf0[7]);
gfx_frame_filter_pass_0(frameBuffer0, frameBuffer1, y + 1, x + 1, &filterBuf0[8]);
func_80027600(filterBuf0, &zBuffer[(SCREEN_WIDTH * y) + x]);
} else {
zBuffer[(SCREEN_WIDTH * y) + x] = frameBuffer0[(SCREEN_WIDTH * y) + x] | 1;
}
}
}
}
// transfers the framebuffer into the depth buffer and applies filters
void gfx_transfer_frame_to_depth(u16* frameBuffer0, u16* frameBuffer1, u16* zBuffer) {
Color_RGBA8 filterBuf0[6];
Color_RGBA8 filterBuf1;
s32 y;
s32 x;
for (y = 1; y < SCREEN_HEIGHT - 1; y++) {
for (x = 2; x < SCREEN_WIDTH - 2; x++) {
s32 pixel = SCREEN_WIDTH * y + x;
/*
The application of gfx_frame_filter_pass_0 is done to the following pixels, where x is the current pixel.
. .
. x .
. .
*/
if (((frameBuffer1[pixel] >> 2) & 0xF) < 8) {
gfx_frame_filter_pass_0(frameBuffer0, frameBuffer1, y - 1, x - 1, &filterBuf0[0]);
gfx_frame_filter_pass_0(frameBuffer0, frameBuffer1, y - 1, x + 1, &filterBuf0[1]);
gfx_frame_filter_pass_0(frameBuffer0, frameBuffer1, y, x - 2, &filterBuf0[2]);
gfx_frame_filter_pass_0(frameBuffer0, frameBuffer1, y, x + 2, &filterBuf0[3]);
gfx_frame_filter_pass_0(frameBuffer0, frameBuffer1, y + 1, x - 1, &filterBuf0[4]);
gfx_frame_filter_pass_0(frameBuffer0, frameBuffer1, y + 1, x + 1, &filterBuf0[5]);
gfx_frame_filter_pass_0(frameBuffer0, frameBuffer1, y, x, &filterBuf1);
gfx_frame_filter_pass_1(filterBuf0, filterBuf1, &zBuffer[pixel]);
} else {
// Don't apply any filters to the edges of the screen
zBuffer[pixel] = frameBuffer0[pixel] | 1;
}
}
}
}
void func_80027BAC(s32 arg0, s32 arg1) {
s32 i;
s32 temp = 24; // todo figure out why this is needed and can't be used elsewhere
gDPPipeSync(gMasterGfxPos++);
gSPTexture(gMasterGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON);
gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, arg1);
gDPSetCycleType(gMasterGfxPos++, G_CYC_COPY);
gDPSetTexturePersp(gMasterGfxPos++, G_TP_NONE);
gDPSetTextureLUT(gMasterGfxPos++, G_TT_NONE);
gDPSetRenderMode(gMasterGfxPos++, G_RM_NOOP, G_RM_NOOP2);
gDPSetTextureFilter(gMasterGfxPos++, G_TF_POINT);
for (i = 0; i < 40; i++) {
gDPLoadTextureTile(gMasterGfxPos++, arg0 + (0xF00 * i), G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH,
SCREEN_HEIGHT, 0, 0, SCREEN_WIDTH - 1, 5, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gSPTextureRectangle(gMasterGfxPos++, 0, i * temp, 0x04FC, (i * 24) + 20, G_TX_RENDERTILE, 0, 0, 0x1000, 0x0400);
gDPPipeSync(gMasterGfxPos++);
}
}
// Logic for the drawing the scene background. In normal operation, it draws the regular background.
// While opening pause menu, it does the following:
// * Extracts coverage from the current framebuffer and saves it to nuGfxCfb[1] on the first frame.
// * Copies the current framebuffer to the depth buffer to save it and applies a filter on the
// saved framebuffer based on the saved coverage values one frame later.
// * Draws the saved framebuffer to the current framebuffer while the pause screen is opened, fading it in over time.
void gfx_draw_background(void) {
Camera* camera;
s32 bgFlags;
s32 backgroundMinX;
s32 backgroundMaxX;
s32 backgroundMinY;
s32 backgroundMaxY;
s32 viewportStartX;
s32 i;
s32 a = SCREEN_COPY_TILE_HEIGHT << 2;
gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT);
camera = &gCameras[gCurrentCameraID];
bgFlags = gGameStatusPtr->backgroundFlags & BACKGROUND_RENDER_STATE_MASK;
switch (bgFlags) {
case BACKGROUND_RENDER_STATE_1:
// Save coverage to nunGfxCfb[1] using the VISCVG render mode
gDPPipeSync(gMasterGfxPos++);
gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, nuGfxCfb[1]);
gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE);
gDPSetBlendColor(gMasterGfxPos++, 0x80, 0x80, 0x80, 0xFF);
gDPSetPrimDepth(gMasterGfxPos++, 0xFFFF, 0xFFFF);
gDPSetDepthSource(gMasterGfxPos++, G_ZS_PRIM);
gDPSetRenderMode(gMasterGfxPos++, G_RM_VISCVG, G_RM_VISCVG2);
gDPFillRectangle(gMasterGfxPos++, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT);
gDPPipeSync(gMasterGfxPos++);
gDPSetDepthSource(gMasterGfxPos++, G_ZS_PIXEL);
gGameStatusPtr->backgroundFlags &= ~BACKGROUND_RENDER_STATE_MASK;
gGameStatusPtr->backgroundFlags |= BACKGROUND_RENDER_STATE_2;
break;
case BACKGROUND_RENDER_STATE_2:
// Save the framebuffer into the depth buffer and run a filter on it based on the saved coverage values
gfx_transfer_frame_to_depth(nuGfxCfb[0], nuGfxCfb[1], nuGfxZBuffer); // applies filters to the framebuffer
gPauseBackgroundFade = 0;
gGameStatusPtr->backgroundFlags &= ~BACKGROUND_RENDER_STATE_MASK;
gGameStatusPtr->backgroundFlags |= BACKGROUND_RENDER_STATE_3;
// fallthrough
case BACKGROUND_RENDER_STATE_3:
// Draw the saved framebuffer to the background, fading in at a rate of 16 opacity per frame until reaching 128 opacity
gPauseBackgroundFade += 16;
if (gPauseBackgroundFade > 128) {
gPauseBackgroundFade = 128;
}
gDPPipeSync(gMasterGfxPos++);
gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT);
gDPSetCycleType(gMasterGfxPos++, G_CYC_FILL);
gDPSetRenderMode(gMasterGfxPos++, G_RM_NOOP, G_RM_NOOP2);
gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, nuGfxCfb_ptr);
gDPSetFillColor(gMasterGfxPos++, PACK_FILL_COLOR(0, 0, 0, 1));
gDPFillRectangle(gMasterGfxPos++, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1);
gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE);
gDPSetTexturePersp(gMasterGfxPos++, G_TP_NONE);
gDPSetTextureLUT(gMasterGfxPos++, G_TT_NONE);
gDPSetRenderMode(gMasterGfxPos++, G_RM_OPA_SURF, G_RM_OPA_SURF2);
// @bug In 1-cycle mode, the two combiner cycles should be identical. Using Texel1 here in the second cycle,
// which is the actual cycle of the combiner used on hardware in 1-cycle mode, actually samples the next
// pixel's texel value instead of the current pixel's. This results in a one-pixel offset.
gDPSetCombineLERP(gMasterGfxPos++, PRIMITIVE, TEXEL0, PRIMITIVE_ALPHA, TEXEL0, 0, 0, 0, 1, PRIMITIVE,
TEXEL1, PRIMITIVE_ALPHA, TEXEL1, 0, 0, 0, 1);
gDPSetPrimColor(gMasterGfxPos++, 0, 0, 40, 40, 40, gPauseBackgroundFade);
gDPSetTextureFilter(gMasterGfxPos++, G_TF_POINT);
for (i = 0; i < 40; i++) {
gDPLoadTextureTile(gMasterGfxPos++, nuGfxZBuffer + (i * SCREEN_WIDTH * SCREEN_COPY_TILE_HEIGHT), G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH,
SCREEN_HEIGHT, 0, 0, SCREEN_WIDTH - 1, SCREEN_COPY_TILE_HEIGHT - 1, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
// @bug Due to the previous issue with the incorrect second cycle combiner, the devs added a 1-pixel offset to texture coordinates
// in this texrect to compensate for the combiner error.
gSPTextureRectangle(gMasterGfxPos++,
// ulx, uly, lrx, lry
0 << 2, i * a, SCREEN_WIDTH << 2, a + (i * (SCREEN_COPY_TILE_HEIGHT << 2)),
// tile
G_TX_RENDERTILE,
// s, t, dsdx, dtdy
-1 << 5, 0 << 5, 1 << 10, 1 << 10);
gDPPipeSync(gMasterGfxPos++);
}
break;
default:
// Draw the scene's background as normal
if (gOverrideFlags & GLOBAL_OVERRIDES_8) {
gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(nuGfxCfb_ptr));
return;
}
gDPSetDepthImage(gMasterGfxPos++, OS_K0_TO_PHYSICAL(nuGfxZBuffer));
gDPSetCycleType(gMasterGfxPos++, G_CYC_FILL);
gDPSetRenderMode(gMasterGfxPos++, G_RM_NOOP, G_RM_NOOP2);
gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, OS_K0_TO_PHYSICAL(nuGfxZBuffer));
gDPSetFillColor(gMasterGfxPos++, PACK_FILL_DEPTH(G_MAXFBZ, 0));
gDPFillRectangle(gMasterGfxPos++, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1);
gDPPipeSync(gMasterGfxPos++);
gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(nuGfxCfb_ptr));
gDPSetFillColor(gMasterGfxPos++, PACK_FILL_COLOR(camera->bgColor[0], camera->bgColor[1], camera->bgColor[2], 1));
backgroundMinX = gGameStatusPtr->backgroundMinX;
backgroundMaxX = backgroundMinX + gGameStatusPtr->backgroundMaxX;
backgroundMinY = gGameStatusPtr->backgroundMinY;
backgroundMaxY = backgroundMinY + gGameStatusPtr->backgroundMaxY;
viewportStartX = camera->viewportStartX;
if (backgroundMinX < viewportStartX) {
backgroundMinX = viewportStartX;
}
if (backgroundMinY < camera->viewportStartY) {
backgroundMinY = camera->viewportStartY;
}
if (backgroundMaxX > viewportStartX + camera->viewportW) {
backgroundMaxX = viewportStartX + camera->viewportW;
}
if (backgroundMaxY > camera->viewportStartY + camera->viewportH) {
backgroundMaxY = camera->viewportStartY + camera->viewportH;
}
if (backgroundMinX < 0) {
backgroundMinX = 0;
}
if (backgroundMinY < 0) {
backgroundMinY = 0;
}
if (backgroundMaxX < 1) {
backgroundMaxX = 1;
}
if (backgroundMaxY < 1) {
backgroundMaxY = 1;
}
if (backgroundMinX > SCREEN_WIDTH - 1) {
backgroundMinX = SCREEN_WIDTH - 1;
}
if (backgroundMinY > SCREEN_HEIGHT - 1) {
backgroundMinY = SCREEN_HEIGHT - 1;
}
if (backgroundMaxX > SCREEN_WIDTH) {
backgroundMaxX = SCREEN_WIDTH;
}
if (backgroundMaxY > SCREEN_HEIGHT) {
backgroundMaxY = SCREEN_HEIGHT;
}
if (!(gGameStatusPtr->backgroundFlags & BACKGROUND_FLAG_TEXTURE)) {
gDPFillRectangle(gMasterGfxPos++, backgroundMinX, backgroundMinY, backgroundMaxX - 1, backgroundMaxY - 1);
} else {
appendGfx_background_texture();
}
gDPPipeSync(gMasterGfxPos++);
gDPSetCycleType(gMasterGfxPos++, G_CYC_FILL);
gDPSetRenderMode(gMasterGfxPos++, G_RM_NOOP, G_RM_NOOP2);
gDPSetFillColor(gMasterGfxPos++, PACK_FILL_COLOR(0, 0, 0, 1));
gDPPipeSync(gMasterGfxPos++);
if (backgroundMinY > 0) {
gDPFillRectangle(gMasterGfxPos++, 0, 0, SCREEN_WIDTH - 1, backgroundMinY - 1);
gDPNoOp(gMasterGfxPos++);
}
if (backgroundMinX > 0) {
gDPFillRectangle(gMasterGfxPos++, 0, backgroundMinY, backgroundMinX - 1, backgroundMaxY - 1);
gDPNoOp(gMasterGfxPos++);
}
if (backgroundMaxX < SCREEN_WIDTH) {
gDPFillRectangle(gMasterGfxPos++, backgroundMaxX, backgroundMinY, SCREEN_WIDTH - 1, backgroundMaxY - 1);
gDPNoOp(gMasterGfxPos++);
}
if (backgroundMaxY < SCREEN_HEIGHT) {
gDPFillRectangle(gMasterGfxPos++, 0, backgroundMaxY, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1);
gDPNoOp(gMasterGfxPos++);
}
break;
}
gDPPipeSync(gMasterGfxPos++);
}

7
src/encounter.c
View File

@ -7,7 +7,14 @@
#include "world/partners.h"
#include "sprite.h"
#include "model.h"
#if !VERSION_JP
// TODO: remove this conditional when more of the JP rom has been processed
#include "sprite/npc/BattleMerlee.h"
#else
#define ANIM_BattleMerlee_Gather 0x00BB0001
#define ANIM_BattleMerlee_Release 0x00BB0000
#endif
ApiStatus ShowMerleeCoinMessage(Evt* script, s32 isInitialCall);
ApiStatus ShowMerleeRanOutMessage(Evt* script, s32 isInitialCall);

9
src/encounter_api.c
View File

@ -351,6 +351,9 @@ ApiStatus BindNpcAI(Evt* script, s32 isInitialCall) {
}
if (enemy->aiScript != NULL) {
#if VERSION_JP
groupFlags = enemy->aiScript->groupFlags;
#endif
kill_script_by_ID(enemy->aiScriptID);
}
@ -401,6 +404,9 @@ ApiStatus RestartNpcAI(Evt* script, s32 isInitialCall) {
}
if (enemy->aiScript != NULL) {
#if VERSION_JP
groupFlags = enemy->aiScript->groupFlags;
#endif
kill_script_by_ID(enemy->aiScriptID);
}
@ -519,6 +525,9 @@ ApiStatus RestartNpcAux(Evt* script, s32 isInitialCall) {
}
if (enemy->auxScript != NULL) {
#if VERSION_JP
groupFlags = enemy->auxScript->groupFlags;
#endif
kill_script_by_ID(enemy->auxScriptID);
}

8
src/is_debug.c
View File

@ -89,15 +89,7 @@ char* is_debug_print(char* arg0, const char* str, size_t count) {
return (char*) 1;
}
#ifdef VERSION_US
void func_80025F44(const char* message, char* file, s32 line) {
osSyncPrintf("File:%s Line:%d %s \n", file, line, message);
PANIC();
}
#elif VERSION_JP
extern const char D_80097D10[]; // "File:%s Line:%d %s \n\0\0\0"
void func_80025F44(char* arg0, char* file, s32 line, char* arg3) {
osSyncPrintf(D_80097D10, file, line, arg0);
PANIC();
}
#endif

214
src/item_table.inc.c
View File

@ -111,7 +111,7 @@ ItemData gItemTable[] = {
.potencyB = 0
},
{ // item 8: Map
.nameMsg = 0,
.nameMsg = MSG_ItemName_Map,
.fullDescMsg = 0,
.shortDescMsg = 0,
.sellValue = -1,
@ -124,7 +124,7 @@ ItemData gItemTable[] = {
.potencyB = 0
},
{ // item 9: BigMap
.nameMsg = 0,
.nameMsg = MSG_ItemName_BigMap,
.fullDescMsg = 0,
.shortDescMsg = 0,
.sellValue = -1,
@ -358,9 +358,9 @@ ItemData gItemTable[] = {
.potencyB = 0
},
{ // item 1B: ForestPass
.nameMsg = 0,
.fullDescMsg = 0,
.shortDescMsg = 0,
.nameMsg = MSG_ItemName_ForestPass,
.fullDescMsg = MSG_ItemFullDesc_ForestPass,
.shortDescMsg = MSG_ItemShortDesc_ForestPass,
.sellValue = -1,
.hudElemID = ITEM_HS_INDEX(HES_Item_ForestPass),
.sortValue = 0,
@ -501,9 +501,9 @@ ItemData gItemTable[] = {
.potencyB = 0
},
{ // item 26: SuspiciousNote
.nameMsg = 0,
.fullDescMsg = 0,
.shortDescMsg = 0,
.nameMsg = MSG_ItemName_SuspiciousNote,
.fullDescMsg = MSG_ItemFullDesc_SuspiciousNote,
.shortDescMsg = MSG_ItemShortDesc_SuspiciousNote,
.sellValue = -1,
.hudElemID = ITEM_HS_INDEX(HES_Item_SuspiciousNote),
.sortValue = 0,
@ -527,9 +527,9 @@ ItemData gItemTable[] = {
.potencyB = 0
},
{ // item 28: Screwdriver
.nameMsg = 0,
.fullDescMsg = 0,
.shortDescMsg = 0,
.nameMsg = MSG_ItemName_Screwdriver,
.fullDescMsg = MSG_ItemFullDesc_Screwdriver,
.shortDescMsg = MSG_ItemShortDesc_Screwdriver,
.sellValue = -1,
.hudElemID = ITEM_HS_INDEX(HES_Item_Screwdriver),
.sortValue = 0,
@ -618,9 +618,9 @@ ItemData gItemTable[] = {
.potencyB = 0
},
{ // item 2F: ToadDoll
.nameMsg = 0,
.fullDescMsg = 0,
.shortDescMsg = 0,
.nameMsg = MSG_ItemName_ToadDoll,
.fullDescMsg = MSG_ItemFullDesc_ToadDoll,
.shortDescMsg = MSG_ItemShortDesc_ToadDoll,
.sellValue = -1,
.hudElemID = ITEM_HS_INDEX(HES_Item_ToadDoll),
.sortValue = 0,
@ -696,9 +696,9 @@ ItemData gItemTable[] = {
.potencyB = 0
},
{ // item 35: UnusedLetter01
.nameMsg = 0,
.fullDescMsg = 0,
.shortDescMsg = 0,
.nameMsg = MSG_ItemName_UnusedLetter,
.fullDescMsg = MSG_ItemFullDesc_UnusedLetter,
.shortDescMsg = MSG_ItemShortDesc_UnusedLetter,
.sellValue = -1,
.hudElemID = ITEM_HS_INDEX(HES_Item_Letter),
.sortValue = 0,
@ -826,9 +826,9 @@ ItemData gItemTable[] = {
.potencyB = 0
},
{ // item 3F: UnusedLetter02
.nameMsg = 0,
.fullDescMsg = 0,
.shortDescMsg = 0,
.nameMsg = MSG_ItemName_UnusedLetter02,
.fullDescMsg = MSG_ItemFullDesc_UnusedLetter02,
.shortDescMsg = MSG_ItemShortDesc_UnusedLetter02,
.sellValue = -1,
.hudElemID = ITEM_HS_INDEX(HES_Item_Letter),
.sortValue = 0,
@ -865,9 +865,9 @@ ItemData gItemTable[] = {
.potencyB = 0
},
{ // item 42: UnusedLetter03
.nameMsg = 0,
.fullDescMsg = 0,
.shortDescMsg = 0,
.nameMsg = MSG_ItemName_UnusedLetter03,
.fullDescMsg = MSG_ItemFullDesc_UnusedLetter03,
.shortDescMsg = MSG_ItemShortDesc_UnusedLetter03,
.sellValue = -1,
.hudElemID = ITEM_HS_INDEX(HES_Item_Letter),
.sortValue = 0,
@ -878,9 +878,9 @@ ItemData gItemTable[] = {
.potencyB = 0
},
{ // item 43: UnusedLetter04
.nameMsg = 0,
.fullDescMsg = 0,
.shortDescMsg = 0,
.nameMsg = MSG_ItemName_UnusedLetter04,
.fullDescMsg = MSG_ItemFullDesc_UnusedLetter04,
.shortDescMsg = MSG_ItemShortDesc_UnusedLetter04,
.sellValue = -1,
.hudElemID = ITEM_HS_INDEX(HES_Item_Letter),
.sortValue = 0,
@ -891,9 +891,9 @@ ItemData gItemTable[] = {
.potencyB = 0
},
{ // item 44: UnusedLetter05
.nameMsg = 0,
.fullDescMsg = 0,
.shortDescMsg = 0,
.nameMsg = MSG_ItemName_UnusedLetter05,
.fullDescMsg = MSG_ItemFullDesc_UnusedLetter05,
.shortDescMsg = MSG_ItemShortDesc_UnusedLetter05,
.sellValue = -1,
.hudElemID = ITEM_HS_INDEX(HES_Item_Letter),
.sortValue = 0,
@ -1008,9 +1008,9 @@ ItemData gItemTable[] = {
.potencyB = 0
},
{ // item 4D: UnusedLetter06
.nameMsg = 0,
.fullDescMsg = 0,
.shortDescMsg = 0,
.nameMsg = MSG_ItemName_UnusedLetter06,
.fullDescMsg = MSG_ItemFullDesc_UnusedLetter06,
.shortDescMsg = MSG_ItemShortDesc_UnusedLetter06,
.sellValue = -1,
.hudElemID = ITEM_HS_INDEX(HES_Item_Letter),
.sortValue = 0,
@ -1112,9 +1112,9 @@ ItemData gItemTable[] = {
.potencyB = 0
},
{ // item 55: UnusedLetter07
.nameMsg = 0,
.fullDescMsg = 0,
.shortDescMsg = 0,
.nameMsg = MSG_ItemName_UnusedLetter,
.fullDescMsg = MSG_ItemFullDesc_UnusedLetter,
.shortDescMsg = MSG_ItemShortDesc_UnusedLetter,
.sellValue = -1,
.hudElemID = ITEM_HS_INDEX(HES_Item_Letter),
.sortValue = 0,
@ -1489,9 +1489,9 @@ ItemData gItemTable[] = {
.potencyB = 0
},
{ // item 72: KootShell
.nameMsg = 0,
.fullDescMsg = 0,
.shortDescMsg = 0,
.nameMsg = MSG_ItemName_KootShell,
.fullDescMsg = MSG_ItemFullDesc_KootShell,
.shortDescMsg = MSG_ItemShortDesc_KootShell,
.sellValue = -1,
.hudElemID = ITEM_HS_INDEX(HES_Item_KootShell),
.sortValue = 0,
@ -1528,9 +1528,9 @@ ItemData gItemTable[] = {
.potencyB = 0
},
{ // item 75: KootAltPhoto
.nameMsg = 0,
.fullDescMsg = 0,
.shortDescMsg = 0,
.nameMsg = MSG_ItemName_KootAltPhoto,
.fullDescMsg = MSG_ItemFullDesc_KootAltPhoto,
.shortDescMsg = MSG_ItemShortDesc_KootAltPhoto,
.sellValue = -1,
.hudElemID = ITEM_HS_INDEX(HES_Item_KootPhoto),
.sortValue = 0,
@ -1762,9 +1762,9 @@ ItemData gItemTable[] = {
.potencyB = 0
},
{ // item 87: InsecticideHerb
.nameMsg = 0,
.fullDescMsg = 0,
.shortDescMsg = 0,
.nameMsg = MSG_ItemName_InsecticideHerb,
.fullDescMsg = MSG_ItemFullDesc_InsecticideHerb,
.shortDescMsg = MSG_ItemShortDesc_InsecticideHerb,
.sellValue = 1,
.hudElemID = ITEM_HS_INDEX(HES_Item_InsecticideHerb),
.sortValue = 0,
@ -1892,9 +1892,9 @@ ItemData gItemTable[] = {
.potencyB = 0
},
{ // item 91: HustleDrink
.nameMsg = 0,
.fullDescMsg = 0,
.shortDescMsg = 0,
.nameMsg = MSG_ItemName_HustleDrink,
.fullDescMsg = MSG_ItemFullDesc_HustleDrink,
.shortDescMsg = MSG_ItemShortDesc_HustleDrink,
.sellValue = 10,
.hudElemID = ITEM_HS_INDEX(HES_Item_HustleDrink),
.sortValue = 0,
@ -1996,9 +1996,9 @@ ItemData gItemTable[] = {
.potencyB = 0
},
{ // item 99: PleaseComeBack
.nameMsg = 0,
.fullDescMsg = 0,
.shortDescMsg = 0,
.nameMsg = MSG_ItemName_PleaseComeBack,
.fullDescMsg = MSG_ItemFullDesc_PleaseComeBack,
.shortDescMsg = MSG_ItemShortDesc_PleaseComeBack,
.sellValue = 5,
.hudElemID = ITEM_HS_INDEX(HES_Item_PleaseComeBack),
.sortValue = 0,
@ -3049,9 +3049,9 @@ ItemData gItemTable[] = {
.potencyB = 0
},
{ // item EA: MysteryScroll
.nameMsg = 0,
.fullDescMsg = 0,
.shortDescMsg = 0,
.nameMsg = MSG_ItemName_MysteryScroll,
.fullDescMsg = MSG_ItemFullDesc_MysteryScroll,
.shortDescMsg = MSG_ItemShortDesc_MysteryScroll,
.sellValue = 100,
.hudElemID = ITEM_HS_INDEX(HES_Item_Present),
.sortValue = 0,
@ -3127,9 +3127,9 @@ ItemData gItemTable[] = {
.potencyB = 0
},
{ // item F0: SmashCharge0
.nameMsg = 0,
.fullDescMsg = 0,
.shortDescMsg = 0,
.nameMsg = MSG_ItemName_SmashCharge0,
.fullDescMsg = MSG_ItemFullDesc_SmashCharge0,
.shortDescMsg = MSG_ItemShortDesc_SmashCharge0,
.sellValue = 30,
.hudElemID = ITEM_HS_INDEX(HES_Item_SmashCharge0),
.sortValue = 20,
@ -3205,9 +3205,9 @@ ItemData gItemTable[] = {
.potencyB = 0
},
{ // item F6: JumpCharge0
.nameMsg = 0,
.fullDescMsg = 0,
.shortDescMsg = 0,
.nameMsg = MSG_ItemName_JumpCharge0,
.fullDescMsg = MSG_ItemFullDesc_JumpCharge0,
.shortDescMsg = MSG_ItemShortDesc_JumpCharge0,
.sellValue = 30,
.hudElemID = ITEM_HS_INDEX(HES_Item_JumpCharge0),
.sortValue = 4,
@ -3348,9 +3348,9 @@ ItemData gItemTable[] = {
.potencyB = 0
},
{ // item 101: Berserker
.nameMsg = 0,
.fullDescMsg = 0,
.shortDescMsg = 0,
.nameMsg = MSG_ItemName_Berserker,
.fullDescMsg = MSG_ItemFullDesc_Berserker,
.shortDescMsg = MSG_ItemShortDesc_Berserker,
.sellValue = 300,
.hudElemID = ITEM_HS_INDEX(HES_Item_Berserker),
.sortValue = 88,
@ -3517,9 +3517,9 @@ ItemData gItemTable[] = {
.potencyB = 0
},
{ // item 10E: AutoJump
.nameMsg = 0,
.fullDescMsg = 0,
.shortDescMsg = 0,
.nameMsg = MSG_ItemName_AutoJump,
.fullDescMsg = MSG_ItemFullDesc_AutoJump,
.shortDescMsg = MSG_ItemShortDesc_AutoJump,
.sellValue = 50,
.hudElemID = ITEM_HS_INDEX(HES_Item_AutoJump),
.sortValue = 15,
@ -3530,9 +3530,9 @@ ItemData gItemTable[] = {
.potencyB = 0
},
{ // item 10F: AutoSmash
.nameMsg = 0,
.fullDescMsg = 0,
.shortDescMsg = 0,
.nameMsg = MSG_ItemName_AutoSmash,
.fullDescMsg = MSG_ItemFullDesc_AutoSmash,
.shortDescMsg = MSG_ItemShortDesc_AutoSmash,
.sellValue = 50,
.hudElemID = ITEM_HS_INDEX(HES_Item_AutoSmash),
.sortValue = 31,
@ -3543,9 +3543,9 @@ ItemData gItemTable[] = {
.potencyB = 0
},
{ // item 110: CrazyHeart
.nameMsg = 0,
.fullDescMsg = 0,
.shortDescMsg = 0,
.nameMsg = MSG_ItemName_CrazyHeart,
.fullDescMsg = MSG_ItemFullDesc_CrazyHeart,
.shortDescMsg = MSG_ItemShortDesc_CrazyHeart,
.sellValue = 300,
.hudElemID = ITEM_HS_INDEX(HES_Item_CrazyHeart),
.sortValue = 45,
@ -3608,9 +3608,9 @@ ItemData gItemTable[] = {
.potencyB = 0
},
{ // item 115: MegaHPDrain
.nameMsg = 0,
.fullDescMsg = 0,
.shortDescMsg = 0,
.nameMsg = MSG_ItemName_MegaHPDrain,
.fullDescMsg = MSG_ItemFullDesc_MegaHPDrain,
.shortDescMsg = MSG_ItemShortDesc_MegaHPDrain,
.sellValue = 100,
.hudElemID = ITEM_HS_INDEX(HES_Item_MegaHPDrain),
.sortValue = 87,
@ -3647,9 +3647,9 @@ ItemData gItemTable[] = {
.potencyB = 0
},
{ // item 118: AutoMultibounce
.nameMsg = 0,
.fullDescMsg = 0,
.shortDescMsg = 0,
.nameMsg = MSG_ItemName_AutoMultibounce,
.fullDescMsg = MSG_ItemFullDesc_AutoMultibounce,
.shortDescMsg = MSG_ItemShortDesc_AutoMultibounce,
.sellValue = 75,
.hudElemID = ITEM_HS_INDEX(HES_Item_AutoMultibounce),
.sortValue = 14,
@ -3660,9 +3660,9 @@ ItemData gItemTable[] = {
.potencyB = 0
},
{ // item 119: FlowerFanatic
.nameMsg = 0,
.fullDescMsg = 0,
.shortDescMsg = 0,
.nameMsg = MSG_ItemName_FlowerFanatic,
.fullDescMsg = MSG_ItemFullDesc_FlowerFanatic,
.shortDescMsg = MSG_ItemShortDesc_FlowerFanatic,
.sellValue = 300,
.hudElemID = ITEM_HS_INDEX(HES_Item_FlowerFanatic),
.sortValue = 66,
@ -3777,9 +3777,9 @@ ItemData gItemTable[] = {
.potencyB = 0
},
{ // item 122: SuperJump
.nameMsg = 0,
.fullDescMsg = 0,
.shortDescMsg = 0,
.nameMsg = MSG_ItemName_SuperJump,
.fullDescMsg = MSG_ItemFullDesc_SuperJump,
.shortDescMsg = MSG_ItemShortDesc_SuperJump,
.sellValue = 100,
.hudElemID = ITEM_HS_INDEX(HES_Item_SuperJump),
.sortValue = 2,
@ -3816,9 +3816,9 @@ ItemData gItemTable[] = {
.potencyB = 0
},
{ // item 125: SuperSmash
.nameMsg = 0,
.fullDescMsg = 0,
.shortDescMsg = 0,
.nameMsg = MSG_ItemName_SuperSmash,
.fullDescMsg = MSG_ItemFullDesc_SuperSmash,
.shortDescMsg = MSG_ItemShortDesc_SuperSmash,
.sellValue = 100,
.hudElemID = ITEM_HS_INDEX(HES_Item_SuperSmash),
.sortValue = 18,
@ -3881,9 +3881,9 @@ ItemData gItemTable[] = {
.potencyB = 0
},
{ // item 12A: SuperFocus
.nameMsg = 0,
.fullDescMsg = 0,
.shortDescMsg = 0,
.nameMsg = MSG_ItemName_SuperFocus,
.fullDescMsg = MSG_ItemFullDesc_SuperFocus,
.shortDescMsg = MSG_ItemShortDesc_SuperFocus,
.sellValue = 100,
.hudElemID = ITEM_HS_INDEX(HES_Item_SuperFocus),
.sortValue = 52,
@ -3907,9 +3907,9 @@ ItemData gItemTable[] = {
.potencyB = 0
},
{ // item 12C: ShellCrack
.nameMsg = 0,
.fullDescMsg = 0,
.shortDescMsg = 0,
.nameMsg = MSG_ItemName_ShellCrack,
.fullDescMsg = MSG_ItemFullDesc_ShellCrack,
.shortDescMsg = MSG_ItemShortDesc_ShellCrack,
.sellValue = 100,
.hudElemID = ITEM_HS_INDEX(HES_Item_Present),
.sortValue = 30,
@ -3920,9 +3920,9 @@ ItemData gItemTable[] = {
.potencyB = 0
},
{ // item 12D: Kaiden
.nameMsg = 0,
.fullDescMsg = 0,
.shortDescMsg = 0,
.nameMsg = MSG_ItemName_Kaiden,
.fullDescMsg = MSG_ItemFullDesc_Kaiden,
.shortDescMsg = MSG_ItemShortDesc_Kaiden,
.sellValue = 300,
.hudElemID = ITEM_HS_INDEX(HES_Item_Kaiden),
.sortValue = 39,
@ -3972,9 +3972,9 @@ ItemData gItemTable[] = {
.potencyB = 0
},
{ // item 131: EarthquakeJump
.nameMsg = 0,
.fullDescMsg = 0,
.shortDescMsg = 0,
.nameMsg = MSG_ItemName_EarthquakeJump,
.fullDescMsg = MSG_ItemFullDesc_EarthquakeJump,
.shortDescMsg = MSG_ItemShortDesc_EarthquakeJump,
.sellValue = 100,
.hudElemID = ITEM_HS_INDEX(HES_Item_EarthquakeJump),
.sortValue = 11,
@ -4375,9 +4375,9 @@ ItemData gItemTable[] = {
.potencyB = 0
},
{ // item 150: HealthyHealthy
.nameMsg = 0,
.fullDescMsg = 0,
.shortDescMsg = 0,
.nameMsg = MSG_ItemName_HealthyHealthy,
.fullDescMsg = MSG_ItemFullDesc_HealthyHealthy,
.shortDescMsg = MSG_ItemShortDesc_HealthyHealthy,
.sellValue = 100,
.hudElemID = ITEM_HS_INDEX(HES_Item_HealthyHealthy),
.sortValue = 93,
@ -4453,7 +4453,7 @@ ItemData gItemTable[] = {
.potencyB = 0
},
{ // item 156: Heart
.nameMsg = 0,
.nameMsg = MSG_ItemName_Heart,
.fullDescMsg = 0,
.shortDescMsg = 0,
.sellValue = -1,
@ -4466,7 +4466,7 @@ ItemData gItemTable[] = {
.potencyB = 0
},
{ // item 157: Coin
.nameMsg = 0,
.nameMsg = MSG_ItemName_Coin,
.fullDescMsg = 0,
.shortDescMsg = 0,
.sellValue = 1,
@ -4479,7 +4479,7 @@ ItemData gItemTable[] = {
.potencyB = 0
},
{ // item 158: HeartPiece
.nameMsg = 0,
.nameMsg = MSG_ItemName_HeartPiece,
.fullDescMsg = 0,
.shortDescMsg = 0,
.sellValue = -1,
@ -4492,7 +4492,7 @@ ItemData gItemTable[] = {
.potencyB = 0
},
{ // item 159: StarPoint
.nameMsg = 0,
.nameMsg = MSG_ItemName_StarPoint,
.fullDescMsg = 0,
.shortDescMsg = 0,
.sellValue = -1,
@ -4505,7 +4505,7 @@ ItemData gItemTable[] = {
.potencyB = 0
},
{ // item 15A: HeartPoint
.nameMsg = 0,
.nameMsg = MSG_ItemName_HeartPoint,
.fullDescMsg = 0,
.shortDescMsg = 0,
.sellValue = -1,
@ -4518,7 +4518,7 @@ ItemData gItemTable[] = {
.potencyB = 0
},
{ // item 15B: FlowerPoint
.nameMsg = 0,
.nameMsg = MSG_ItemName_FlowerPoint,
.fullDescMsg = 0,
.shortDescMsg = 0,
.sellValue = 1,

25
src/jp/10080.c
View File

@ -1,25 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "10080", func_80034C80);
INCLUDE_ASM(s32, "10080", func_80034CD8);
INCLUDE_ASM(s32, "10080", func_80034E48);
INCLUDE_ASM(s32, "10080", func_8003516C);
INCLUDE_ASM(s32, "10080", func_80035244);
INCLUDE_ASM(s32, "10080", func_8003524C);
INCLUDE_ASM(s32, "10080", func_80035254);
INCLUDE_ASM(s32, "10080", func_800352E0);
INCLUDE_ASM(s32, "10080", func_80035384);
INCLUDE_ASM(s32, "10080", func_800357C0);
INCLUDE_ASM(s32, "10080", func_80035998);
INCLUDE_ASM(s32, "10080", func_800359A0);

9
src/jp/10DB0.c
View File

@ -1,9 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "10DB0", func_800359B0);
INCLUDE_ASM(s32, "10DB0", func_800359D4);
INCLUDE_ASM(s32, "10DB0", func_80035A20);
INCLUDE_ASM(s32, "10DB0", func_80035A4C);

25
src/jp/10E70.c
View File

@ -1,25 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "10E70", func_80035A70);
INCLUDE_ASM(s32, "10E70", func_80035A80);
INCLUDE_ASM(s32, "10E70", func_80035AA4);
INCLUDE_ASM(s32, "10E70", func_80035AD4);
INCLUDE_ASM(s32, "10E70", func_80035B6C);
INCLUDE_ASM(s32, "10E70", func_80035D7C);
INCLUDE_ASM(s32, "10E70", func_80035DB0);
INCLUDE_ASM(s32, "10E70", func_80035DFC);
INCLUDE_ASM(s32, "10E70", func_8003607C);
INCLUDE_ASM(s32, "10E70", func_800360B0);
INCLUDE_ASM(s32, "10E70", func_800360EC);
INCLUDE_ASM(s32, "10E70", func_800362C0);

7
src/jp/116D0.c
View File

@ -1,7 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "116D0", func_800362D0);
INCLUDE_ASM(s32, "116D0", func_800364D4);
INCLUDE_ASM(s32, "116D0", func_80036A60);

19
src/jp/11E70.c
View File

@ -1,19 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "11E70", func_80036A70);
INCLUDE_ASM(s32, "11E70", func_80036D44);
INCLUDE_ASM(s32, "11E70", func_80037234);
INCLUDE_ASM(s32, "11E70", func_800372C8);
INCLUDE_ASM(s32, "11E70", func_800375F0);
INCLUDE_ASM(s32, "11E70", func_800375F8);
INCLUDE_ASM(s32, "11E70", func_80037624);
INCLUDE_ASM(s32, "11E70", func_80037860);
INCLUDE_ASM(s32, "11E70", func_80037AAC);

7
src/jp/13140.c
View File

@ -1,7 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "13140", func_80037D40);
INCLUDE_ASM(s32, "13140", func_80037DB4);
INCLUDE_ASM(s32, "13140", func_8003811C);

201
src/jp/13530.c
View File

@ -1,201 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "13530", func_80038130);
INCLUDE_ASM(s32, "13530", func_80038138);
INCLUDE_ASM(s32, "13530", func_8003817C);
INCLUDE_ASM(s32, "13530", func_800381EC);
INCLUDE_ASM(s32, "13530", func_8003823C);
INCLUDE_ASM(s32, "13530", func_80038258);
INCLUDE_ASM(s32, "13530", func_80038504);
INCLUDE_ASM(s32, "13530", func_80038524);
INCLUDE_ASM(s32, "13530", func_80038540);
INCLUDE_ASM(s32, "13530", func_80038560);
INCLUDE_ASM(s32, "13530", func_8003868C);
INCLUDE_ASM(s32, "13530", func_8003879C);
INCLUDE_ASM(s32, "13530", func_800387BC);
INCLUDE_ASM(s32, "13530", func_80038CCC);
INCLUDE_ASM(s32, "13530", func_80038F98);
INCLUDE_ASM(s32, "13530", func_80039348);
INCLUDE_ASM(s32, "13530", func_800394A8);
INCLUDE_ASM(s32, "13530", func_800395F0);
INCLUDE_ASM(s32, "13530", func_80039A64);
INCLUDE_ASM(s32, "13530", func_80039C90);
INCLUDE_ASM(s32, "13530", func_8003A4B0);
INCLUDE_ASM(s32, "13530", func_8003A714);
INCLUDE_ASM(s32, "13530", func_8003A7AC);
INCLUDE_ASM(s32, "13530", func_8003A808);
INCLUDE_ASM(s32, "13530", func_8003A860);
INCLUDE_ASM(s32, "13530", func_8003A8BC);
INCLUDE_ASM(s32, "13530", func_8003A91C);
INCLUDE_ASM(s32, "13530", func_8003A9E4);
INCLUDE_ASM(s32, "13530", func_8003AA6C);
INCLUDE_ASM(s32, "13530", func_8003AAB8);
INCLUDE_ASM(s32, "13530", func_8003AAF8);
INCLUDE_ASM(s32, "13530", func_8003AE44);
INCLUDE_ASM(s32, "13530", func_8003AE58);
INCLUDE_ASM(s32, "13530", func_8003AE68);
INCLUDE_ASM(s32, "13530", func_8003AE70);
INCLUDE_ASM(s32, "13530", func_8003B000);
INCLUDE_ASM(s32, "13530", func_8003B090);
INCLUDE_ASM(s32, "13530", func_8003B0B8);
INCLUDE_ASM(s32, "13530", func_8003B0E0);
INCLUDE_ASM(s32, "13530", func_8003B10C);
INCLUDE_ASM(s32, "13530", func_8003B124);
INCLUDE_ASM(s32, "13530", func_8003B13C);
INCLUDE_ASM(s32, "13530", func_8003B1C0);
INCLUDE_ASM(s32, "13530", func_8003B274);
INCLUDE_ASM(s32, "13530", func_8003B62C);
INCLUDE_ASM(s32, "13530", func_8003B720);
INCLUDE_ASM(s32, "13530", func_8003BB98);
INCLUDE_ASM(s32, "13530", func_8003C098);
INCLUDE_ASM(s32, "13530", func_8003C0E8);
INCLUDE_ASM(s32, "13530", func_8003C104);
INCLUDE_ASM(s32, "13530", func_8003C1FC);
INCLUDE_ASM(s32, "13530", func_8003C2DC);
INCLUDE_ASM(s32, "13530", func_8003C318);
INCLUDE_ASM(s32, "13530", func_8003C320);
INCLUDE_ASM(s32, "13530", func_8003C328);
INCLUDE_ASM(s32, "13530", func_8003C44C);
INCLUDE_ASM(s32, "13530", func_8003C468);
INCLUDE_ASM(s32, "13530", func_8003C56C);
INCLUDE_ASM(s32, "13530", func_8003C574);
INCLUDE_ASM(s32, "13530", func_8003C644);
INCLUDE_ASM(s32, "13530", func_8003C668);
INCLUDE_ASM(s32, "13530", func_8003C7E0);
INCLUDE_ASM(s32, "13530", func_8003C804);
INCLUDE_ASM(s32, "13530", func_8003C94C);
INCLUDE_ASM(s32, "13530", func_8003C970);
INCLUDE_ASM(s32, "13530", func_8003CC60);
INCLUDE_ASM(s32, "13530", func_8003CC68);
INCLUDE_ASM(s32, "13530", func_8003CC74);
INCLUDE_ASM(s32, "13530", func_8003CD84);
INCLUDE_ASM(s32, "13530", func_8003CE94);
INCLUDE_ASM(s32, "13530", func_8003CFB8);
INCLUDE_ASM(s32, "13530", func_8003D07C);
INCLUDE_ASM(s32, "13530", func_8003D2E4);
INCLUDE_ASM(s32, "13530", func_8003D320);
INCLUDE_ASM(s32, "13530", func_8003D448);
INCLUDE_ASM(s32, "13530", func_8003D6F8);
INCLUDE_ASM(s32, "13530", func_8003D8F8);
INCLUDE_ASM(s32, "13530", func_8003DC60);
INCLUDE_ASM(s32, "13530", func_8003DD94);
INCLUDE_ASM(s32, "13530", func_8003DE90);
INCLUDE_ASM(s32, "13530", func_8003DFA0);
INCLUDE_ASM(s32, "13530", func_8003DFF8);
INCLUDE_ASM(s32, "13530", func_8003E0C0);
INCLUDE_ASM(s32, "13530", func_8003E1CC);
INCLUDE_ASM(s32, "13530", func_8003E1D4);
INCLUDE_ASM(s32, "13530", func_8003E1E4);
INCLUDE_ASM(s32, "13530", func_8003E270);
INCLUDE_ASM(s32, "13530", func_8003E2FC);
INCLUDE_ASM(s32, "13530", func_8003E330);
INCLUDE_ASM(s32, "13530", func_8003E338);
INCLUDE_ASM(s32, "13530", func_8003E3F0);
INCLUDE_ASM(s32, "13530", func_8003E46C);
INCLUDE_ASM(s32, "13530", func_8003E60C);
INCLUDE_ASM(s32, "13530", func_8003E674);
INCLUDE_ASM(s32, "13530", func_8003E6DC);
INCLUDE_ASM(s32, "13530", func_8003E744);
INCLUDE_ASM(s32, "13530", func_8003E810);
INCLUDE_ASM(s32, "13530", func_8003E8DC);
INCLUDE_ASM(s32, "13530", func_8003E9A8);
INCLUDE_ASM(s32, "13530", func_8003EA28);

59
src/jp/19EB0.c
View File

@ -1,59 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "19EB0", func_8003EAB0);
INCLUDE_ASM(s32, "19EB0", func_8003EB00);
INCLUDE_ASM(s32, "19EB0", func_8003EB58);
INCLUDE_ASM(s32, "19EB0", func_8003EB8C);
INCLUDE_ASM(s32, "19EB0", func_8003EBC0);
INCLUDE_ASM(s32, "19EB0", func_8003EC58);
INCLUDE_ASM(s32, "19EB0", func_8003ECD8);
INCLUDE_ASM(s32, "19EB0", func_8003ED44);
INCLUDE_ASM(s32, "19EB0", func_8003ED84);
INCLUDE_ASM(s32, "19EB0", func_8003F044);
INCLUDE_ASM(s32, "19EB0", func_8003F058);
INCLUDE_ASM(s32, "19EB0", func_8003F0B4);
INCLUDE_ASM(s32, "19EB0", func_8003F0D4);
INCLUDE_ASM(s32, "19EB0", func_8003F18C);
INCLUDE_ASM(s32, "19EB0", func_8003F240);
INCLUDE_ASM(s32, "19EB0", func_8003F3A8);
INCLUDE_ASM(s32, "19EB0", func_8003F48C);
INCLUDE_ASM(s32, "19EB0", func_8004101C);
INCLUDE_ASM(s32, "19EB0", func_80041024);
INCLUDE_ASM(s32, "19EB0", func_80041624);
INCLUDE_ASM(s32, "19EB0", func_8004191C);
INCLUDE_ASM(s32, "19EB0", func_80041BD0);
INCLUDE_ASM(s32, "19EB0", func_80042D0C);
INCLUDE_ASM(s32, "19EB0", func_80042D5C);
INCLUDE_ASM(s32, "19EB0", func_80042E94);
INCLUDE_ASM(s32, "19EB0", func_80042E9C);
INCLUDE_ASM(s32, "19EB0", func_80043370);
INCLUDE_ASM(s32, "19EB0", func_80043E00);
INCLUDE_ASM(s32, "19EB0", func_80043E08);

13
src/jp/1B10.c
View File

@ -1,13 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "1B10", func_80026710);
INCLUDE_ASM(s32, "1B10", func_800269C0);
INCLUDE_ASM(s32, "1B10", func_80026AD4);
INCLUDE_ASM(s32, "1B10", func_80026DA8);
INCLUDE_ASM(s32, "1B10", func_80027054);
INCLUDE_ASM(s32, "1B10", func_8002715C);

101
src/jp/1F240.c
View File

@ -1,101 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "1F240", func_80043E40);
INCLUDE_ASM(s32, "1F240", func_80043EB0);
INCLUDE_ASM(s32, "1F240", func_80043EF8);
INCLUDE_ASM(s32, "1F240", func_80043F24);
INCLUDE_ASM(s32, "1F240", func_80043F50);
INCLUDE_ASM(s32, "1F240", func_80043F58);
INCLUDE_ASM(s32, "1F240", func_80044000);
INCLUDE_ASM(s32, "1F240", func_80044138);
INCLUDE_ASM(s32, "1F240", func_8004423C);
INCLUDE_ASM(s32, "1F240", func_80044268);
INCLUDE_ASM(s32, "1F240", func_80044294);
INCLUDE_ASM(s32, "1F240", func_800442C0);
INCLUDE_ASM(s32, "1F240", func_800442EC);
INCLUDE_ASM(s32, "1F240", func_80044374);
INCLUDE_ASM(s32, "1F240", func_80044500);
INCLUDE_ASM(s32, "1F240", func_80044520);
INCLUDE_ASM(s32, "1F240", func_8004455C);
INCLUDE_ASM(s32, "1F240", func_800446F8);
INCLUDE_ASM(s32, "1F240", func_80044738);
INCLUDE_ASM(s32, "1F240", func_8004486C);
INCLUDE_ASM(s32, "1F240", func_800448EC);
INCLUDE_ASM(s32, "1F240", func_800449B0);
INCLUDE_ASM(s32, "1F240", func_80044A64);
INCLUDE_ASM(s32, "1F240", func_80044B78);
INCLUDE_ASM(s32, "1F240", func_80044BF8);
INCLUDE_ASM(s32, "1F240", func_80044CB0);
INCLUDE_ASM(s32, "1F240", func_80044D64);
INCLUDE_ASM(s32, "1F240", func_80044E00);
INCLUDE_ASM(s32, "1F240", func_80044E9C);
INCLUDE_ASM(s32, "1F240", func_80044F1C);
INCLUDE_ASM(s32, "1F240", func_80044F80);
INCLUDE_ASM(s32, "1F240", func_80044FE0);
INCLUDE_ASM(s32, "1F240", func_8004507C);
INCLUDE_ASM(s32, "1F240", func_8004511C);
INCLUDE_ASM(s32, "1F240", func_800451CC);
INCLUDE_ASM(s32, "1F240", func_800451E4);
INCLUDE_ASM(s32, "1F240", func_80045240);
INCLUDE_ASM(s32, "1F240", func_800452D4);
INCLUDE_ASM(s32, "1F240", func_80045300);
INCLUDE_ASM(s32, "1F240", func_80045348);
INCLUDE_ASM(s32, "1F240", func_800453EC);
INCLUDE_ASM(s32, "1F240", func_800453F4);
INCLUDE_ASM(s32, "1F240", func_80045458);
INCLUDE_ASM(s32, "1F240", func_80045484);
INCLUDE_ASM(s32, "1F240", func_800454B8);
INCLUDE_ASM(s32, "1F240", func_800454CC);
INCLUDE_ASM(s32, "1F240", func_800454F8);
INCLUDE_ASM(s32, "1F240", func_8004558C);
INCLUDE_ASM(s32, "1F240", func_800455C0);
INCLUDE_ASM(s32, "1F240", func_80045718);

99
src/jp/20B80.c
View File

@ -1,99 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "20B80", func_80045780);
INCLUDE_ASM(s32, "20B80", func_800457D0);
INCLUDE_ASM(s32, "20B80", func_80045828);
INCLUDE_ASM(s32, "20B80", func_80045888);
INCLUDE_ASM(s32, "20B80", func_800458E8);
INCLUDE_ASM(s32, "20B80", func_80045948);
INCLUDE_ASM(s32, "20B80", func_80045984);
INCLUDE_ASM(s32, "20B80", func_800459C0);
INCLUDE_ASM(s32, "20B80", func_80045A3C);
INCLUDE_ASM(s32, "20B80", func_80045B0C);
INCLUDE_ASM(s32, "20B80", func_80045B5C);
INCLUDE_ASM(s32, "20B80", func_80045C50);
INCLUDE_ASM(s32, "20B80", func_80045C60);
INCLUDE_ASM(s32, "20B80", func_80045CDC);
INCLUDE_ASM(s32, "20B80", func_8004628C);
INCLUDE_ASM(s32, "20B80", func_800472B4);
INCLUDE_ASM(s32, "20B80", func_800473A0);
INCLUDE_ASM(s32, "20B80", func_80047438);
INCLUDE_ASM(s32, "20B80", func_800474A0);
INCLUDE_ASM(s32, "20B80", func_800474CC);
INCLUDE_ASM(s32, "20B80", func_80047544);
INCLUDE_ASM(s32, "20B80", func_800475A4);
INCLUDE_ASM(s32, "20B80", func_800475D4);
INCLUDE_ASM(s32, "20B80", func_8004764C);
INCLUDE_ASM(s32, "20B80", func_800476AC);
INCLUDE_ASM(s32, "20B80", func_800476DC);
INCLUDE_ASM(s32, "20B80", func_80047754);
INCLUDE_ASM(s32, "20B80", func_800477B4);
INCLUDE_ASM(s32, "20B80", func_800477E4);
INCLUDE_ASM(s32, "20B80", func_80047830);
INCLUDE_ASM(s32, "20B80", func_80047890);
INCLUDE_ASM(s32, "20B80", func_800478C0);
INCLUDE_ASM(s32, "20B80", func_80047950);
INCLUDE_ASM(s32, "20B80", func_800479AC);
INCLUDE_ASM(s32, "20B80", func_800479DC);
INCLUDE_ASM(s32, "20B80", func_80047A6C);
INCLUDE_ASM(s32, "20B80", func_80047AC8);
INCLUDE_ASM(s32, "20B80", func_80047AF8);
INCLUDE_ASM(s32, "20B80", func_80047B88);
INCLUDE_ASM(s32, "20B80", func_80047BD4);
INCLUDE_ASM(s32, "20B80", func_80047C04);
INCLUDE_ASM(s32, "20B80", func_80047C94);
INCLUDE_ASM(s32, "20B80", func_80047CE0);
INCLUDE_ASM(s32, "20B80", func_80047D10);
INCLUDE_ASM(s32, "20B80", func_80047DA0);
INCLUDE_ASM(s32, "20B80", func_80047DEC);
INCLUDE_ASM(s32, "20B80", func_80047E1C);
INCLUDE_ASM(s32, "20B80", func_80047EAC);
INCLUDE_ASM(s32, "20B80", func_80047EF8);

39
src/jp/23330.c
View File

@ -1,39 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "23330", func_80047F30);
INCLUDE_ASM(s32, "23330", func_80048A00);
INCLUDE_ASM(s32, "23330", func_80048AE4);
INCLUDE_ASM(s32, "23330", func_80048BBC);
INCLUDE_ASM(s32, "23330", func_80048C84);
INCLUDE_ASM(s32, "23330", func_80048D64);
INCLUDE_ASM(s32, "23330", func_8004909C);
INCLUDE_ASM(s32, "23330", func_80049170);
INCLUDE_ASM(s32, "23330", func_80049200);
INCLUDE_ASM(s32, "23330", func_80049250);
INCLUDE_ASM(s32, "23330", func_80049368);
INCLUDE_ASM(s32, "23330", func_800497F4);
INCLUDE_ASM(s32, "23330", func_800498B4);
INCLUDE_ASM(s32, "23330", func_80049AEC);
INCLUDE_ASM(s32, "23330", func_80049B7C);
INCLUDE_ASM(s32, "23330", func_80049C2C);
INCLUDE_ASM(s32, "23330", func_80049DD4);
INCLUDE_ASM(s32, "23330", func_8004A098);
INCLUDE_ASM(s32, "23330", func_8004A12C);

17
src/jp/2570.c
View File

@ -1,17 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "2570", func_80027170);
INCLUDE_ASM(s32, "2570", func_800271CC);
INCLUDE_ASM(s32, "2570", func_8002722C);
INCLUDE_ASM(s32, "2570", func_800275D0);
INCLUDE_ASM(s32, "2570", func_80027744);
INCLUDE_ASM(s32, "2570", func_80027984);
INCLUDE_ASM(s32, "2570", func_80027B7C);
INCLUDE_ASM(s32, "2570", func_80027DE0);

7
src/jp/257A0.c
View File

@ -1,7 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "257A0", func_8004A3A0);
INCLUDE_ASM(s32, "257A0", func_8004A3EC);
INCLUDE_ASM(s32, "257A0", func_8004A434);

17
src/jp/25BB0.c
View File

@ -1,17 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "25BB0", func_8004A7B0);
INCLUDE_ASM(s32, "25BB0", func_8004AA80);
INCLUDE_ASM(s32, "25BB0", func_8004AAB8);
INCLUDE_ASM(s32, "25BB0", func_8004AED4);
INCLUDE_ASM(s32, "25BB0", func_8004AF18);
INCLUDE_ASM(s32, "25BB0", func_8004AFD8);
INCLUDE_ASM(s32, "25BB0", func_8004B09C);
INCLUDE_ASM(s32, "25BB0", func_8004B0BC);

97
src/jp/264F0.c
View File

@ -1,97 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "264F0", func_8004B0F0);
INCLUDE_ASM(s32, "264F0", func_8004B2DC);
INCLUDE_ASM(s32, "264F0", func_8004B348);
INCLUDE_ASM(s32, "264F0", func_8004B388);
INCLUDE_ASM(s32, "264F0", func_8004B3F8);
INCLUDE_ASM(s32, "264F0", func_8004B694);
INCLUDE_ASM(s32, "264F0", func_8004B704);
INCLUDE_ASM(s32, "264F0", func_8004B724);
INCLUDE_ASM(s32, "264F0", func_8004BD94);
INCLUDE_ASM(s32, "264F0", func_8004BF18);
INCLUDE_ASM(s32, "264F0", func_8004BF54);
INCLUDE_ASM(s32, "264F0", func_8004BFB0);
INCLUDE_ASM(s32, "264F0", func_8004C008);
INCLUDE_ASM(s32, "264F0", func_8004C084);
INCLUDE_ASM(s32, "264F0", func_8004C0F4);
INCLUDE_ASM(s32, "264F0", func_8004C228);
INCLUDE_ASM(s32, "264F0", func_8004C4F4);
INCLUDE_ASM(s32, "264F0", func_8004C534);
INCLUDE_ASM(s32, "264F0", func_8004CA44);
INCLUDE_ASM(s32, "264F0", func_8004CAA8);
INCLUDE_ASM(s32, "264F0", func_8004CB20);
INCLUDE_ASM(s32, "264F0", func_8004CB54);
INCLUDE_ASM(s32, "264F0", func_8004CB74);
INCLUDE_ASM(s32, "264F0", func_8004CBBC);
INCLUDE_ASM(s32, "264F0", func_8004CBEC);
INCLUDE_ASM(s32, "264F0", func_8004CCBC);
INCLUDE_ASM(s32, "264F0", func_8004CCE8);
INCLUDE_ASM(s32, "264F0", func_8004CD00);
INCLUDE_ASM(s32, "264F0", func_8004CD2C);
INCLUDE_ASM(s32, "264F0", func_8004CDC4);
INCLUDE_ASM(s32, "264F0", func_8004CDE0);
INCLUDE_ASM(s32, "264F0", func_8004CE0C);
INCLUDE_ASM(s32, "264F0", func_8004CE30);
INCLUDE_ASM(s32, "264F0", func_8004CE64);
INCLUDE_ASM(s32, "264F0", func_8004CEEC);
INCLUDE_ASM(s32, "264F0", func_8004CF60);
INCLUDE_ASM(s32, "264F0", func_8004CF94);
INCLUDE_ASM(s32, "264F0", func_8004CFC0);
INCLUDE_ASM(s32, "264F0", func_8004CFCC);
INCLUDE_ASM(s32, "264F0", func_8004CFD4);
INCLUDE_ASM(s32, "264F0", func_8004CFEC);
INCLUDE_ASM(s32, "264F0", func_8004D004);
INCLUDE_ASM(s32, "264F0", func_8004D01C);
INCLUDE_ASM(s32, "264F0", func_8004D050);
INCLUDE_ASM(s32, "264F0", func_8004D0A8);
INCLUDE_ASM(s32, "264F0", func_8004D0D8);
INCLUDE_ASM(s32, "264F0", func_8004D134);
INCLUDE_ASM(s32, "264F0", func_8004D16C);

137
src/jp/285C0.c
View File

@ -1,137 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "285C0", func_8004D1C0);
INCLUDE_ASM(s32, "285C0", func_8004D444);
INCLUDE_ASM(s32, "285C0", func_8004D490);
INCLUDE_ASM(s32, "285C0", func_8004D6BC);
INCLUDE_ASM(s32, "285C0", func_8004D724);
INCLUDE_ASM(s32, "285C0", func_8004D758);
INCLUDE_ASM(s32, "285C0", func_8004D790);
INCLUDE_ASM(s32, "285C0", func_8004D7D8);
INCLUDE_ASM(s32, "285C0", func_8004D7FC);
INCLUDE_ASM(s32, "285C0", func_8004D930);
INCLUDE_ASM(s32, "285C0", func_8004D968);
INCLUDE_ASM(s32, "285C0", func_8004DADC);
INCLUDE_ASM(s32, "285C0", func_8004DC84);
INCLUDE_ASM(s32, "285C0", func_8004DDA4);
INCLUDE_ASM(s32, "285C0", func_8004DE08);
INCLUDE_ASM(s32, "285C0", func_8004DFF4);
INCLUDE_ASM(s32, "285C0", func_8004E054);
INCLUDE_ASM(s32, "285C0", func_8004E0F4);
INCLUDE_ASM(s32, "285C0", func_8004E168);
INCLUDE_ASM(s32, "285C0", func_8004E288);
INCLUDE_ASM(s32, "285C0", func_8004E4F4);
INCLUDE_ASM(s32, "285C0", func_8004E530);
INCLUDE_ASM(s32, "285C0", func_8004E5B4);
INCLUDE_ASM(s32, "285C0", func_8004E6E4);
INCLUDE_ASM(s32, "285C0", func_8004E784);
INCLUDE_ASM(s32, "285C0", func_8004E8B4);
INCLUDE_ASM(s32, "285C0", func_8004E918);
INCLUDE_ASM(s32, "285C0", func_8004F86C);
INCLUDE_ASM(s32, "285C0", func_8004F8B8);
INCLUDE_ASM(s32, "285C0", func_8004F964);
INCLUDE_ASM(s32, "285C0", func_8004F994);
INCLUDE_ASM(s32, "285C0", func_8004F9B4);
INCLUDE_ASM(s32, "285C0", func_8004F9E8);
INCLUDE_ASM(s32, "285C0", func_8004FA44);
INCLUDE_ASM(s32, "285C0", func_8004FAC0);
INCLUDE_ASM(s32, "285C0", func_8004FB1C);
INCLUDE_ASM(s32, "285C0", func_8004FB60);
INCLUDE_ASM(s32, "285C0", func_8004FB80);
INCLUDE_ASM(s32, "285C0", func_8004FBEC);
INCLUDE_ASM(s32, "285C0", func_8004FC08);
INCLUDE_ASM(s32, "285C0", func_8004FC20);
INCLUDE_ASM(s32, "285C0", func_8004FC38);
INCLUDE_ASM(s32, "285C0", func_8004FC58);
INCLUDE_ASM(s32, "285C0", func_8004FC64);
INCLUDE_ASM(s32, "285C0", func_8004FC78);
INCLUDE_ASM(s32, "285C0", func_8004FC94);
INCLUDE_ASM(s32, "285C0", func_8004FCA0);
INCLUDE_ASM(s32, "285C0", func_8004FCAC);
INCLUDE_ASM(s32, "285C0", func_8004FCB4);
INCLUDE_ASM(s32, "285C0", func_8004FCD0);
INCLUDE_ASM(s32, "285C0", func_8004FDD8);
INCLUDE_ASM(s32, "285C0", func_8004FE0C);
INCLUDE_ASM(s32, "285C0", func_8004FE34);
INCLUDE_ASM(s32, "285C0", func_8004FE58);
INCLUDE_ASM(s32, "285C0", func_8004FFA0);
INCLUDE_ASM(s32, "285C0", func_80050210);
INCLUDE_ASM(s32, "285C0", func_80050218);
INCLUDE_ASM(s32, "285C0", func_80050294);
INCLUDE_ASM(s32, "285C0", func_80050304);
INCLUDE_ASM(s32, "285C0", func_8005033C);
INCLUDE_ASM(s32, "285C0", func_80050378);
INCLUDE_ASM(s32, "285C0", func_80050420);
INCLUDE_ASM(s32, "285C0", func_800504C8);
INCLUDE_ASM(s32, "285C0", func_800504EC);
INCLUDE_ASM(s32, "285C0", func_8005052C);
INCLUDE_ASM(s32, "285C0", func_80050538);
INCLUDE_ASM(s32, "285C0", func_800505B0);
INCLUDE_ASM(s32, "285C0", func_80050620);

41
src/jp/2BC40.c
View File

@ -1,41 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "2BC40", func_80050840);
INCLUDE_ASM(s32, "2BC40", func_800508E0);
INCLUDE_ASM(s32, "2BC40", func_80050904);
INCLUDE_ASM(s32, "2BC40", func_80050914);
INCLUDE_ASM(s32, "2BC40", func_80050950);
INCLUDE_ASM(s32, "2BC40", func_80050A00);
INCLUDE_ASM(s32, "2BC40", func_80050AC8);
INCLUDE_ASM(s32, "2BC40", func_80050B34);
INCLUDE_ASM(s32, "2BC40", func_80050BA0);
INCLUDE_ASM(s32, "2BC40", func_80050C14);
INCLUDE_ASM(s32, "2BC40", func_80050C80);
INCLUDE_ASM(s32, "2BC40", func_80050D00);
INCLUDE_ASM(s32, "2BC40", func_80050D54);
INCLUDE_ASM(s32, "2BC40", func_80050E6C);
INCLUDE_ASM(s32, "2BC40", func_80050FE4);
INCLUDE_ASM(s32, "2BC40", func_800510E4);
INCLUDE_ASM(s32, "2BC40", func_80051E80);
INCLUDE_ASM(s32, "2BC40", func_80051E98);
INCLUDE_ASM(s32, "2BC40", func_80051F58);
INCLUDE_ASM(s32, "2BC40", func_80051FDC);

17
src/jp/2D650.c
View File

@ -1,17 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "2D650", func_80052250);
INCLUDE_ASM(s32, "2D650", func_800522C4);
INCLUDE_ASM(s32, "2D650", func_80052310);
INCLUDE_ASM(s32, "2D650", func_800527F4);
INCLUDE_ASM(s32, "2D650", func_80052870);
INCLUDE_ASM(s32, "2D650", func_800528A8);
INCLUDE_ASM(s32, "2D650", func_800529AC);
INCLUDE_ASM(s32, "2D650", func_80052AC8);

91
src/jp/2DEE0.c
View File

@ -1,91 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "2DEE0", func_80052AE0);
INCLUDE_ASM(s32, "2DEE0", func_80052B0C);
INCLUDE_ASM(s32, "2DEE0", func_80052FA4);
INCLUDE_ASM(s32, "2DEE0", func_80053020);
INCLUDE_ASM(s32, "2DEE0", func_80053058);
INCLUDE_ASM(s32, "2DEE0", func_80053080);
INCLUDE_ASM(s32, "2DEE0", func_80053270);
INCLUDE_ASM(s32, "2DEE0", func_80053304);
INCLUDE_ASM(s32, "2DEE0", func_80053538);
INCLUDE_ASM(s32, "2DEE0", func_80053574);
INCLUDE_ASM(s32, "2DEE0", func_800535A8);
INCLUDE_ASM(s32, "2DEE0", func_80053624);
INCLUDE_ASM(s32, "2DEE0", func_800536C8);
INCLUDE_ASM(s32, "2DEE0", func_800536D8);
INCLUDE_ASM(s32, "2DEE0", func_80053748);
INCLUDE_ASM(s32, "2DEE0", func_80053778);
INCLUDE_ASM(s32, "2DEE0", func_8005379C);
INCLUDE_ASM(s32, "2DEE0", func_800537B4);
INCLUDE_ASM(s32, "2DEE0", func_80053858);
INCLUDE_ASM(s32, "2DEE0", func_80053898);
INCLUDE_ASM(s32, "2DEE0", func_80053908);
INCLUDE_ASM(s32, "2DEE0", func_80053964);
INCLUDE_ASM(s32, "2DEE0", func_800539A8);
INCLUDE_ASM(s32, "2DEE0", func_80053B08);
INCLUDE_ASM(s32, "2DEE0", func_80053C14);
INCLUDE_ASM(s32, "2DEE0", func_80053C30);
INCLUDE_ASM(s32, "2DEE0", func_80053EF8);
INCLUDE_ASM(s32, "2DEE0", func_80053F6C);
INCLUDE_ASM(s32, "2DEE0", func_8005412C);
INCLUDE_ASM(s32, "2DEE0", func_800541A8);
INCLUDE_ASM(s32, "2DEE0", func_80054264);
INCLUDE_ASM(s32, "2DEE0", func_8005430C);
INCLUDE_ASM(s32, "2DEE0", func_800543F4);
INCLUDE_ASM(s32, "2DEE0", func_80054478);
INCLUDE_ASM(s32, "2DEE0", func_800546A8);
INCLUDE_ASM(s32, "2DEE0", func_80054750);
INCLUDE_ASM(s32, "2DEE0", func_800548FC);
INCLUDE_ASM(s32, "2DEE0", func_80054934);
INCLUDE_ASM(s32, "2DEE0", func_80054990);
INCLUDE_ASM(s32, "2DEE0", func_80054A24);
INCLUDE_ASM(s32, "2DEE0", func_80054A58);
INCLUDE_ASM(s32, "2DEE0", func_80054AB0);
INCLUDE_ASM(s32, "2DEE0", func_80054B40);
INCLUDE_ASM(s32, "2DEE0", func_80054BF8);
INCLUDE_ASM(s32, "2DEE0", func_80054C24);

3
src/jp/30070.c
View File

@ -1,3 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "30070", func_80054C70);

137
src/jp/30100.c
View File

@ -1,137 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "30100", func_80054D00);
INCLUDE_ASM(s32, "30100", func_80054D18);
INCLUDE_ASM(s32, "30100", func_80054DC0);
INCLUDE_ASM(s32, "30100", func_80054DEC);
INCLUDE_ASM(s32, "30100", func_80054E90);
INCLUDE_ASM(s32, "30100", func_80054EF0);
INCLUDE_ASM(s32, "30100", func_80054F80);
INCLUDE_ASM(s32, "30100", func_80054FE0);
INCLUDE_ASM(s32, "30100", func_80055070);
INCLUDE_ASM(s32, "30100", func_800550A4);
INCLUDE_ASM(s32, "30100", func_800550B8);
INCLUDE_ASM(s32, "30100", func_800550F8);
INCLUDE_ASM(s32, "30100", func_80055114);
INCLUDE_ASM(s32, "30100", func_80055154);
INCLUDE_ASM(s32, "30100", func_80055198);
INCLUDE_ASM(s32, "30100", func_800551EC);
INCLUDE_ASM(s32, "30100", func_80055240);
INCLUDE_ASM(s32, "30100", func_80055294);
INCLUDE_ASM(s32, "30100", func_800552C8);
INCLUDE_ASM(s32, "30100", func_8005531C);
INCLUDE_ASM(s32, "30100", func_80055380);
INCLUDE_ASM(s32, "30100", func_800553C8);
INCLUDE_ASM(s32, "30100", func_80055410);
INCLUDE_ASM(s32, "30100", func_8005547C);
INCLUDE_ASM(s32, "30100", func_800554F8);
INCLUDE_ASM(s32, "30100", func_80055584);
INCLUDE_ASM(s32, "30100", func_800555CC);
INCLUDE_ASM(s32, "30100", func_80055620);
INCLUDE_ASM(s32, "30100", func_80055674);
INCLUDE_ASM(s32, "30100", func_80055690);
INCLUDE_ASM(s32, "30100", func_800556AC);
INCLUDE_ASM(s32, "30100", func_800556C8);
INCLUDE_ASM(s32, "30100", func_8005571C);
INCLUDE_ASM(s32, "30100", func_8005576C);
INCLUDE_ASM(s32, "30100", func_800557A0);
INCLUDE_ASM(s32, "30100", func_800557D8);
INCLUDE_ASM(s32, "30100", func_80055830);
INCLUDE_ASM(s32, "30100", func_80055868);
INCLUDE_ASM(s32, "30100", func_800558A0);
INCLUDE_ASM(s32, "30100", func_800558DC);
INCLUDE_ASM(s32, "30100", func_80055914);
INCLUDE_ASM(s32, "30100", func_80055944);
INCLUDE_ASM(s32, "30100", func_80055974);
INCLUDE_ASM(s32, "30100", func_80055998);
INCLUDE_ASM(s32, "30100", func_800559E8);
INCLUDE_ASM(s32, "30100", func_80055A3C);
INCLUDE_ASM(s32, "30100", func_80055A8C);
INCLUDE_ASM(s32, "30100", func_80055AF8);
INCLUDE_ASM(s32, "30100", func_80055B64);
INCLUDE_ASM(s32, "30100", func_80055C08);
INCLUDE_ASM(s32, "30100", func_80055C84);
INCLUDE_ASM(s32, "30100", func_80055CA0);
INCLUDE_ASM(s32, "30100", func_80055CBC);
INCLUDE_ASM(s32, "30100", func_80055CD8);
INCLUDE_ASM(s32, "30100", func_80055CF4);
INCLUDE_ASM(s32, "30100", func_80055D18);
INCLUDE_ASM(s32, "30100", func_80055D3C);
INCLUDE_ASM(s32, "30100", func_80055D58);
INCLUDE_ASM(s32, "30100", func_80055D6C);
INCLUDE_ASM(s32, "30100", func_80055DBC);
INCLUDE_ASM(s32, "30100", func_80055DF4);
INCLUDE_ASM(s32, "30100", func_80055E0C);
INCLUDE_ASM(s32, "30100", func_80055E30);
INCLUDE_ASM(s32, "30100", func_80055E54);
INCLUDE_ASM(s32, "30100", func_80055E74);
INCLUDE_ASM(s32, "30100", func_80055E94);
INCLUDE_ASM(s32, "30100", func_80055EB4);
INCLUDE_ASM(s32, "30100", func_80055ED8);

79
src/jp/31300.c
View File

@ -1,79 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "31300", func_80055F00);
INCLUDE_ASM(s32, "31300", func_80056254);
INCLUDE_ASM(s32, "31300", func_80056270);
INCLUDE_ASM(s32, "31300", func_800569E4);
INCLUDE_ASM(s32, "31300", func_800569F4);
INCLUDE_ASM(s32, "31300", func_80056A00);
INCLUDE_ASM(s32, "31300", func_80056A0C);
INCLUDE_ASM(s32, "31300", func_80056A28);
INCLUDE_ASM(s32, "31300", func_80056A54);
INCLUDE_ASM(s32, "31300", func_80056A7C);
INCLUDE_ASM(s32, "31300", func_80056AE4);
INCLUDE_ASM(s32, "31300", func_80056B70);
INCLUDE_ASM(s32, "31300", func_80056B98);
INCLUDE_ASM(s32, "31300", func_80056C28);
INCLUDE_ASM(s32, "31300", func_80056C54);
INCLUDE_ASM(s32, "31300", func_80056ED4);
INCLUDE_ASM(s32, "31300", func_80056FF4);
INCLUDE_ASM(s32, "31300", func_8005701C);
INCLUDE_ASM(s32, "31300", func_800571F8);
INCLUDE_ASM(s32, "31300", func_8005739C);
INCLUDE_ASM(s32, "31300", func_80057524);
INCLUDE_ASM(s32, "31300", func_80057688);
INCLUDE_ASM(s32, "31300", func_80057814);
INCLUDE_ASM(s32, "31300", func_8005783C);
INCLUDE_ASM(s32, "31300", func_80057864);
INCLUDE_ASM(s32, "31300", func_8005788C);
INCLUDE_ASM(s32, "31300", func_800578B4);
INCLUDE_ASM(s32, "31300", func_800578DC);
INCLUDE_ASM(s32, "31300", func_80057904);
INCLUDE_ASM(s32, "31300", func_800579BC);
INCLUDE_ASM(s32, "31300", func_80057A78);
INCLUDE_ASM(s32, "31300", func_80057AB8);
INCLUDE_ASM(s32, "31300", func_80057B0C);
INCLUDE_ASM(s32, "31300", func_80057B60);
INCLUDE_ASM(s32, "31300", func_80057B80);
INCLUDE_ASM(s32, "31300", func_80057BD0);
INCLUDE_ASM(s32, "31300", func_80057C40);
INCLUDE_ASM(s32, "31300", func_80057C88);
INCLUDE_ASM(s32, "31300", func_80057CB4);

7
src/jp/33100.c
View File

@ -1,7 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "33100", func_80057D00);
INCLUDE_ASM(s32, "33100", func_800587D0);
INCLUDE_ASM(s32, "33100", func_8005891C);

41
src/jp/33E80.c
View File

@ -1,41 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "33E80", func_80058A80);
INCLUDE_ASM(s32, "33E80", func_80058B34);
INCLUDE_ASM(s32, "33E80", func_80058C38);
INCLUDE_ASM(s32, "33E80", func_80058CB8);
INCLUDE_ASM(s32, "33E80", func_80058CFC);
INCLUDE_ASM(s32, "33E80", func_80058FC0);
INCLUDE_ASM(s32, "33E80", func_80059550);
INCLUDE_ASM(s32, "33E80", func_80059768);
INCLUDE_ASM(s32, "33E80", func_80059884);
INCLUDE_ASM(s32, "33E80", func_80059930);
INCLUDE_ASM(s32, "33E80", func_80059938);
INCLUDE_ASM(s32, "33E80", func_8005994C);
INCLUDE_ASM(s32, "33E80", func_800599F8);
INCLUDE_ASM(s32, "33E80", func_80059A00);
INCLUDE_ASM(s32, "33E80", func_80059BA4);
INCLUDE_ASM(s32, "33E80", func_80059C44);
INCLUDE_ASM(s32, "33E80", func_80059F6C);
INCLUDE_ASM(s32, "33E80", func_8005A100);
INCLUDE_ASM(s32, "33E80", func_8005A190);
INCLUDE_ASM(s32, "33E80", func_8005A214);

15
src/jp/35770.c
View File

@ -1,15 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "35770", func_8005A370);
INCLUDE_ASM(s32, "35770", func_8005A3A4);
INCLUDE_ASM(s32, "35770", func_8005A890);
INCLUDE_ASM(s32, "35770", func_8005A8A0);
INCLUDE_ASM(s32, "35770", func_8005A8B0);
INCLUDE_ASM(s32, "35770", func_8005A9A0);
INCLUDE_ASM(s32, "35770", func_8005AA88);

51
src/jp/35F50.c
View File

@ -1,51 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "35F50", func_8005AB50);
INCLUDE_ASM(s32, "35F50", func_8005AC34);
INCLUDE_ASM(s32, "35F50", func_8005AC3C);
INCLUDE_ASM(s32, "35F50", func_8005AC44);
INCLUDE_ASM(s32, "35F50", func_8005AC70);
INCLUDE_ASM(s32, "35F50", func_8005AD08);
INCLUDE_ASM(s32, "35F50", func_8005AE50);
INCLUDE_ASM(s32, "35F50", func_8005AEEC);
INCLUDE_ASM(s32, "35F50", func_8005B430);
INCLUDE_ASM(s32, "35F50", func_8005B650);
INCLUDE_ASM(s32, "35F50", func_8005B6A4);
INCLUDE_ASM(s32, "35F50", func_8005B6D4);
INCLUDE_ASM(s32, "35F50", func_8005BA58);
INCLUDE_ASM(s32, "35F50", func_8005BA88);
INCLUDE_ASM(s32, "35F50", func_8005BAC0);
INCLUDE_ASM(s32, "35F50", func_8005BB34);
INCLUDE_ASM(s32, "35F50", func_8005C14C);
INCLUDE_ASM(s32, "35F50", func_8005C454);
INCLUDE_ASM(s32, "35F50", func_8005C980);
INCLUDE_ASM(s32, "35F50", func_8005CDD4);
INCLUDE_ASM(s32, "35F50", func_8005CF8C);
INCLUDE_ASM(s32, "35F50", func_8005D0F8);
INCLUDE_ASM(s32, "35F50", func_8005D7B0);
INCLUDE_ASM(s32, "35F50", func_8005DA04);
INCLUDE_ASM(s32, "35F50", func_8005DAA0);

9
src/jp/38EC0.c
View File

@ -1,9 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "38EC0", func_8005DAC0);
INCLUDE_ASM(s32, "38EC0", func_8005DB7C);
INCLUDE_ASM(s32, "38EC0", func_8005DC84);
INCLUDE_ASM(s32, "38EC0", func_8005DDDC);

29
src/jp/39960.c
View File

@ -1,29 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "39960", func_8005E560);
INCLUDE_ASM(s32, "39960", func_8005E5BC);
INCLUDE_ASM(s32, "39960", func_8005E660);
INCLUDE_ASM(s32, "39960", func_8005E890);
INCLUDE_ASM(s32, "39960", func_8005EAE0);
INCLUDE_ASM(s32, "39960", func_8005EB6C);
INCLUDE_ASM(s32, "39960", func_8005EBE8);
INCLUDE_ASM(s32, "39960", func_8005EC28);
INCLUDE_ASM(s32, "39960", func_8005EC34);
INCLUDE_ASM(s32, "39960", func_8005EC40);
INCLUDE_ASM(s32, "39960", func_8005EC4C);
INCLUDE_ASM(s32, "39960", func_8005EC58);
INCLUDE_ASM(s32, "39960", func_8005ED70);
INCLUDE_ASM(s32, "39960", func_8005EDD0);

3
src/jp/3A300.c
View File

@ -1,3 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "3A300", nuGfxFuncSet);

3
src/jp/3A340.c
View File

@ -1,3 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "3A340", nuGfxPreNMIFuncSet);

3
src/jp/3A380.c
View File

@ -1,3 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "3A380", func_8005EF80);

3
src/jp/3A3A0.c
View File

@ -1,3 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "3A3A0", func_8005EFA0);

3
src/jp/3A4B0.c
View File

@ -1,3 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "3A4B0", nuGfxDisplayOff);

3
src/jp/3A4E0.c
View File

@ -1,3 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "3A4E0", nuGfxDisplayOn);

5
src/jp/3A500.c
View File

@ -1,5 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "3A500", func_8005F100);
INCLUDE_ASM(s32, "3A500", func_8005F140);

5
src/jp/3A610.c
View File

@ -1,5 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "3A610", nuGfxInitEX2);
INCLUDE_ASM(s32, "3A610", nuContInit);

3
src/jp/3A700.c
View File

@ -1,3 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "3A700", func_8005F300);

21
src/jp/3A760.c
View File

@ -1,21 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "3A760", func_8005F360);
INCLUDE_ASM(s32, "3A760", func_8005F384);
INCLUDE_ASM(s32, "3A760", func_8005F3A8);
INCLUDE_ASM(s32, "3A760", func_8005F3F8);
INCLUDE_ASM(s32, "3A760", func_8005F420);
INCLUDE_ASM(s32, "3A760", func_8005F460);
INCLUDE_ASM(s32, "3A760", func_8005F514);
INCLUDE_ASM(s32, "3A760", func_8005F554);
INCLUDE_ASM(s32, "3A760", func_8005F580);
INCLUDE_ASM(s32, "3A760", func_8005F5AC);

19
src/jp/3A9D0.c
View File

@ -1,19 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "3A9D0", func_8005F5D0);
INCLUDE_ASM(s32, "3A9D0", func_8005F7C0);
INCLUDE_ASM(s32, "3A9D0", func_8005F93C);
INCLUDE_ASM(s32, "3A9D0", func_8005F99C);
INCLUDE_ASM(s32, "3A9D0", func_8005F9C0);
INCLUDE_ASM(s32, "3A9D0", func_8005FA08);
INCLUDE_ASM(s32, "3A9D0", func_8005FA94);
INCLUDE_ASM(s32, "3A9D0", func_8005FABC);
INCLUDE_ASM(s32, "3A9D0", func_8005FB04);

3
src/jp/3AF40.c
View File

@ -1,3 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "3AF40", func_8005FB40);

3
src/jp/3AFA0.c
View File

@ -1,3 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "3AFA0", func_8005FBA0);

3
src/jp/3B040.c
View File

@ -1,3 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "3B040", func_8005FC40);

7
src/jp/3B2A0.c
View File

@ -1,7 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "3B2A0", func_8005FEA0);
INCLUDE_ASM(s32, "3B2A0", func_8005FEF8);
INCLUDE_ASM(s32, "3B2A0", func_8005FFC0);

3
src/jp/3B400.c
View File

@ -1,3 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "3B400", func_80060000);

3
src/jp/3B420.c
View File

@ -1,3 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "3B420", func_80060020);

11
src/jp/3B4A0.c
View File

@ -1,11 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "3B4A0", func_800600A0);
INCLUDE_ASM(s32, "3B4A0", func_80060230);
INCLUDE_ASM(s32, "3B4A0", func_800602C8);
INCLUDE_ASM(s32, "3B4A0", func_8006032C);
INCLUDE_ASM(s32, "3B4A0", func_80060390);

5
src/jp/3B7C0.c
View File

@ -1,5 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "3B7C0", func_800603C0);
INCLUDE_ASM(s32, "3B7C0", func_80060460);

21
src/jp/3B8E0.c
View File

@ -1,21 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "3B8E0", func_800604E0);
INCLUDE_ASM(s32, "3B8E0", func_800605B8);
INCLUDE_ASM(s32, "3B8E0", func_800605DC);
INCLUDE_ASM(s32, "3B8E0", func_80060604);
INCLUDE_ASM(s32, "3B8E0", func_8006062C);
INCLUDE_ASM(s32, "3B8E0", func_80060708);
INCLUDE_ASM(s32, "3B8E0", func_80060784);
INCLUDE_ASM(s32, "3B8E0", func_80060840);
INCLUDE_ASM(s32, "3B8E0", func_80060890);
INCLUDE_ASM(s32, "3B8E0", func_800608C0);

7
src/jp/3BC0.c
View File

@ -1,7 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "3BC0", func_800287C0);
INCLUDE_ASM(s32, "3BC0", func_80028808);
INCLUDE_ASM(s32, "3BC0", func_80028844);

9
src/jp/3BCF0.c
View File

@ -1,9 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "3BCF0", func_800608F0);
INCLUDE_ASM(s32, "3BCF0", func_80060910);
INCLUDE_ASM(s32, "3BCF0", func_800609B0);
INCLUDE_ASM(s32, "3BCF0", func_80060B40);

3
src/jp/3C1F0.c
View File

@ -1,3 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "3C1F0", func_80060DF0);

3
src/jp/3C290.c
View File

@ -1,3 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "3C290", func_80060E90);

3
src/jp/3C2E0.c
View File

@ -1,3 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "3C2E0", func_80060EE0);

3
src/jp/3C460.c
View File

@ -1,3 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "3C460", func_80061060);

7
src/jp/3C820.c
View File

@ -1,7 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "3C820", func_80061420);
INCLUDE_ASM(s32, "3C820", func_80061474);
INCLUDE_ASM(s32, "3C820", func_800614E0);

7
src/jp/3C910.c
View File

@ -1,7 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "3C910", func_80061510);
INCLUDE_ASM(s32, "3C910", func_80061520);
INCLUDE_ASM(s32, "3C910", func_80061530);

3
src/jp/3CA50.c
View File

@ -1,3 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "3CA50", func_80061650);

5
src/jp/3CAF0.c
View File

@ -1,5 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "3CAF0", func_800616F0);
INCLUDE_ASM(s32, "3CAF0", func_800617A0);

3
src/jp/3CC20.c
View File

@ -1,3 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "3CC20", func_80061820);

3
src/jp/3CCA0.c
View File

@ -1,3 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "3CCA0", func_800618A0);

11
src/jp/3CCD0.c
View File

@ -1,11 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "3CCD0", func_800618D0);
INCLUDE_ASM(s32, "3CCD0", func_80061950);
INCLUDE_ASM(s32, "3CCD0", func_80061970);
INCLUDE_ASM(s32, "3CCD0", func_800619F8);
INCLUDE_ASM(s32, "3CCD0", func_80061A94);

7
src/jp/3CF50.c
View File

@ -1,7 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "3CF50", func_80061B50);
INCLUDE_ASM(s32, "3CF50", func_80061CEC);
INCLUDE_ASM(s32, "3CF50", func_80061DA0);

3
src/jp/3D260.c
View File

@ -1,3 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "3D260", func_80061E60);

3
src/jp/3D2C0.c
View File

@ -1,3 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "3D2C0", func_80061EC0);

3
src/jp/3D2D0.c
View File

@ -1,3 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "3D2D0", func_80061ED0);

5
src/jp/3D300.c
View File

@ -1,5 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "3D300", func_80061F00);
INCLUDE_ASM(s32, "3D300", func_80062030);

5
src/jp/3D580.c
View File

@ -1,5 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "3D580", func_80062180);
INCLUDE_ASM(s32, "3D580", func_80062500);

5
src/jp/3DC90.c
View File

@ -1,5 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "3DC90", func_80062890);
INCLUDE_ASM(s32, "3DC90", func_80063214);

5
src/jp/3E6F0.c
View File

@ -1,5 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "3E6F0", func_800632F0);
INCLUDE_ASM(s32, "3E6F0", func_80063868);

5
src/jp/3ECE0.c
View File

@ -1,5 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "3ECE0", func_800638E0);
INCLUDE_ASM(s32, "3ECE0", func_80063A10);

5
src/jp/3EF60.c
View File

@ -1,5 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "3EF60", func_80063B60);
INCLUDE_ASM(s32, "3EF60", func_80063D10);

5
src/jp/3F2E0.c
View File

@ -1,5 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "3F2E0", func_80063EE0);
INCLUDE_ASM(s32, "3F2E0", func_800640B8);

5
src/jp/3F6A0.c
View File

@ -1,5 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "3F6A0", func_800642A0);
INCLUDE_ASM(s32, "3F6A0", func_80064428);

3
src/jp/3F9C0.c
View File

@ -1,3 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "3F9C0", func_800645C0);

11
src/jp/3FA20.c
View File

@ -1,11 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "3FA20", func_80064620);
INCLUDE_ASM(s32, "3FA20", func_80064940);
INCLUDE_ASM(s32, "3FA20", func_800649E0);
INCLUDE_ASM(s32, "3FA20", func_80064A20);
INCLUDE_ASM(s32, "3FA20", func_80064A44);

9
src/jp/3FE70.c
View File

@ -1,9 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "3FE70", _Printf);
INCLUDE_ASM(s32, "3FE70", func_80064FF0);
INCLUDE_ASM(s32, "3FE70", func_800654C0);
INCLUDE_ASM(s32, "3FE70", func_80065518);

3
src/jp/40950.c
View File

@ -1,3 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "40950", func_80065550);

3
src/jp/40980.c
View File

@ -1,3 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "40980", func_80065580);

3
src/jp/40AC0.c
View File

@ -1,3 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "40AC0", func_800656C0);

5
src/jp/40BF0.c
View File

@ -1,5 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "40BF0", func_800657F0);
INCLUDE_ASM(s32, "40BF0", func_80065920);

3
src/jp/40DD0.c
View File

@ -1,3 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "40DD0", osGetCount);

5
src/jp/40DE0.c
View File

@ -1,5 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "40DE0", func_800659E0);
INCLUDE_ASM(s32, "40DE0", func_80065BEC);

3
src/jp/41020.c
View File

@ -1,3 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "41020", func_80065C20);

3
src/jp/41040.c
View File

@ -1,3 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "41040", func_80065C40);

3
src/jp/41090.c
View File

@ -1,3 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "41090", func_80065C90);

7
src/jp/41140.c
View File

@ -1,7 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "41140", func_80065D40);
INCLUDE_ASM(s32, "41140", func_80065D94);
INCLUDE_ASM(s32, "41140", func_80065E00);

5
src/jp/41230.c
View File

@ -1,5 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "41230", func_80065E30);
INCLUDE_ASM(s32, "41230", func_80065F00);

3
src/jp/41320.c
View File

@ -1,3 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "41320", func_80065F20);

3
src/jp/413F0.c
View File

@ -1,3 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "413F0", func_80065FF0);

Some files were not shown because too many files have changed in this diff Show More