diff --git a/include/d/actor/d_a_player_main.h b/include/d/actor/d_a_player_main.h index f5d86cf63..cef725c06 100644 --- a/include/d/actor/d_a_player_main.h +++ b/include/d/actor/d_a_player_main.h @@ -9,6 +9,8 @@ #include "d/d_drawlist.h" #include "d/d_bg_w.h" #include "d/actor/d_a_player.h" +#include "d/res/res_link.h" +#include "d/res/res_lkanm.h" class mDoExt_MtxCalcOldFrame; @@ -281,764 +283,6 @@ public: /* 0x02 */ u16 mUpperBckIdx; }; -enum LINK_RES_FILE_ID { // IDs and indexes are synced - /* BCK */ - LINK_BCK_ATNGSHA=0xA, - LINK_BCK_BOMB=0xB, - LINK_BCK_COMBO_TATE=0xC, - LINK_BCK_GICER01=0xD, - LINK_BCK_GWP00=0xE, - LINK_BCK_SWGRIPMSAB=0xF, - LINK_BCK_YUCHW00=0x10, - - /* BDL */ - LINK_BDL_BINFAIRY=0x13, - LINK_BDL_BOOMERANG=0x14, - LINK_BDL_BOTTLECAP=0x15, - LINK_BDL_BOW=0x16, - LINK_BDL_CAMERA=0x17, - LINK_BDL_CL=0x18, - LINK_BDL_FAN=0x19, - LINK_BDL_FANB=0x1A, - LINK_BDL_FANSMALL=0x1B, - LINK_BDL_HAMMER=0x1C, - LINK_BDL_HANDS=0x1D, - LINK_BDL_HOOKSHOT=0x1E, - LINK_BDL_HYOINOMI=0x1F, - LINK_BDL_KATSURA=0x20, - LINK_BDL_LETTER=0x21, - LINK_BDL_PODMS=0x22, - LINK_BDL_PRING=0x23, - LINK_BDL_SHA=0x24, - LINK_BDL_SWA=0x25, - LINK_BDL_SWGRIPA=0x26, - LINK_BDL_TCEIVER=0x27, - LINK_BDL_TETOLACH=0x28, - LINK_BDL_YAMU=0x29, - - /* BDLC */ - LINK_BDL_ESA=0x2C, - LINK_BDL_HBOOTS=0x2D, - LINK_BDL_ROPEEND=0x2E, - LINK_BDL_TELESCOPE=0x2F, - - /* BDLI */ - LINK_BDL_GARWFI00=0x32, - LINK_BDL_GARWFI01=0x33, - LINK_BDL_GARWG00=0x34, - - /* BDLM */ - LINK_BDL_ARROW=0x37, - LINK_BDL_ARROWGLITTER=0x38, - LINK_BDL_BINHO=0x39, - LINK_BDL_BINLIQUID=0x3A, - LINK_BDL_BINLIQUIDH=0x3B, - LINK_BDL_BOMB=0x3C, - LINK_BDL_BOTTLEEMP=0x3D, - LINK_BDL_CUTFH=0x3E, - LINK_BDL_CUTFM=0x3F, - LINK_BDL_GICER00=0x40, - LINK_BDL_GICER01=0x41, - LINK_BDL_GWP00=0x42, - LINK_BDL_SHMS=0x43, - LINK_BDL_SUIMEN_MUNYA=0x44, - LINK_BDL_SWGRIPMS=0x45, - LINK_BDL_SWMS=0x46, - LINK_BDL_TAKT=0x47, - LINK_BDL_YAURA00=0x48, - LINK_BDL_YBAFO00=0x49, - LINK_BDL_YHSLS00=0x4A, - LINK_BDL_YMGCS00=0x4B, - LINK_BDL_YMSLI00=0x4C, - LINK_BDL_YMSLS00=0x4D, - LINK_BDL_YUCHW00=0x4E, - - /* BRK */ - LINK_BRK_BOMB=0x51, - LINK_BRK_GARWFI00=0x52, - LINK_BRK_GARWFI01=0x53, - LINK_BRK_GARWG00=0x54, - LINK_BRK_GWP00=0x55, - LINK_BRK_TSWGRIPMSAB=0x56, - LINK_BRK_YAURA00_G=0x57, - LINK_BRK_YAURA00_R=0x58, - LINK_BRK_YMGCS00_MS=0x59, - LINK_BRK_YMGCS00_TS=0x5A, - LINK_BRK_YUCHW00=0x5B, - - /* BTK */ - LINK_BTK_GARWFI00=0x5E, - LINK_BTK_GARWFI01=0x5F, - LINK_BTK_GARWG00=0x60, - LINK_BTK_GICER00=0x61, - LINK_BTK_GICER01=0x62, - LINK_BTK_GWP00=0x63, - LINK_BTK_SUIMEN_MUNYA=0x64, - LINK_BTK_TARROWGLITTER=0x65, - LINK_BTK_TSHMS=0x66, - LINK_BTK_TSWGRIPMS=0x67, - LINK_BTK_TTIPICE=0x68, - LINK_BTK_YAURA00=0x69, - LINK_BTK_YBAFO00=0x6A, - LINK_BTK_YMGCS00=0x6B, - LINK_BTK_YMSLS00=0x6C, - LINK_BTK_YUCHW00=0x6D, - - /* TEX */ - LINK_BTI_BLUR=0x70, - LINK_BTI_LINKTEXBCI4=0x71, - LINK_BTI_ROCK_MARK=0x72, -}; - -enum LKANM_RES_FILE_ID { // IDs and indexes are synced - /* BCKS */ - LKANM_BCK_ACTIONTAKTRDW=0x8, - LKANM_BCK_ACTIONTAKTRL=0x9, - LKANM_BCK_ACTIONTAKTRR=0xA, - LKANM_BCK_ACTIONTAKTRUP=0xB, - LKANM_BCK_ARROWRELORD=0xC, - LKANM_BCK_ARROWRELORDA=0xD, - LKANM_BCK_ARROWSHOOT=0xE, - LKANM_BCK_ARROWSHOOTA=0xF, - LKANM_BCK_ATNBOKO=0x10, - LKANM_BCK_ATNDB=0x11, - LKANM_BCK_ATNDL=0x12, - LKANM_BCK_ATNDLS=0x13, - LKANM_BCK_ATNDR=0x14, - LKANM_BCK_ATNDRS=0x15, - LKANM_BCK_ATNG=0x16, - LKANM_BCK_ATNGAHAM=0x17, - LKANM_BCK_ATNGAHAMA=0x18, - LKANM_BCK_ATNGAL=0x19, - LKANM_BCK_ATNGAR=0x1A, - LKANM_BCK_ATNGHAM=0x1B, - LKANM_BCK_ATNHAM=0x1C, - LKANM_BCK_ATNJL=0x1D, - LKANM_BCK_ATNJLLAND=0x1E, - LKANM_BCK_ATNJR=0x1F, - LKANM_BCK_ATNJRLAND=0x20, - LKANM_BCK_ATNL=0x21, - LKANM_BCK_ATNLS=0x22, - LKANM_BCK_ATNR=0x23, - LKANM_BCK_ATNRS=0x24, - LKANM_BCK_ATNWB=0x25, - LKANM_BCK_ATNWL=0x26, - LKANM_BCK_ATNWLS=0x27, - LKANM_BCK_ATNWR=0x28, - LKANM_BCK_ATNWRS=0x29, - LKANM_BCK_BINDRINKAFTER=0x2A, - LKANM_BCK_BINDRINKING=0x2B, - LKANM_BCK_BINDRINKPRE=0x2C, - LKANM_BCK_BINGET=0x2D, - LKANM_BCK_BINOPENA=0x2E, - LKANM_BCK_BINOPENB=0x2F, - LKANM_BCK_BINOPENPRE=0x30, - LKANM_BCK_BINSWINGS=0x31, - LKANM_BCK_BINSWINGU=0x32, - LKANM_BCK_BOOMCATCH=0x33, - LKANM_BCK_BOOMTHROW=0x34, - LKANM_BCK_BOOMWAIT=0x35, - LKANM_BCK_BOWWAIT=0x36, - LKANM_BCK_BOWWAITA=0x37, - LKANM_BCK_BOXOPENLINK=0x38, - LKANM_BCK_BOXOPENSHORTLINK=0x39, - LKANM_BCK_BOXOPENSLINK=0x3A, - LKANM_BCK_COMBO_KEN=0x3B, - LKANM_BCK_COMBO_LINK=0x3C, - LKANM_BCK_COMEOUT=0x3D, - LKANM_BCK_CROUCH=0x3E, - LKANM_BCK_CUTA=0x3F, - LKANM_BCK_CUTAA=0x40, - LKANM_BCK_CUTAMS=0x41, - LKANM_BCK_CUTBOKO=0x42, - LKANM_BCK_CUTEA=0x43, - LKANM_BCK_CUTEAA=0x44, - LKANM_BCK_CUTEAMS=0x45, - LKANM_BCK_CUTEB=0x46, - LKANM_BCK_CUTEBA=0x47, - LKANM_BCK_CUTEBMS=0x48, - LKANM_BCK_CUTF=0x49, - LKANM_BCK_CUTFA=0x4A, - LKANM_BCK_CUTFMS=0x4B, - LKANM_BCK_CUTKESA=0x4C, - LKANM_BCK_CUTKESAA=0x4D, - LKANM_BCK_CUTKESAMS=0x4E, - LKANM_BCK_CUTL=0x4F, - LKANM_BCK_CUTLA=0x50, - LKANM_BCK_CUTLMS=0x51, - LKANM_BCK_CUTR=0x52, - LKANM_BCK_CUTRA=0x53, - LKANM_BCK_CUTREHAM=0x54, - LKANM_BCK_CUTREL=0x55, - LKANM_BCK_CUTRER=0x56, - LKANM_BCK_CUTRMS=0x57, - LKANM_BCK_CUTTURN=0x58, - LKANM_BCK_CUTTURNA=0x59, - LKANM_BCK_CUTTURNB=0x5A, - LKANM_BCK_CUTTURNC=0x5B, - LKANM_BCK_CUTTURNMS=0x5C, - LKANM_BCK_CUTTURNP=0x5D, - LKANM_BCK_CUTTURNPB=0x5E, - LKANM_BCK_CUTTURNPWFB=0x5F, - LKANM_BCK_CUTTURNPWLR=0x60, - LKANM_BCK_DAM=0x61, - LKANM_BCK_DAMB=0x62, - LKANM_BCK_DAMBIRI=0x63, - LKANM_BCK_DAMDASH=0x64, - LKANM_BCK_DAMF=0x65, - LKANM_BCK_DAMFB=0x66, - LKANM_BCK_DAMFBUP=0x67, - LKANM_BCK_DAMFF=0x68, - LKANM_BCK_DAMFFUP=0x69, - LKANM_BCK_DAMFL=0x6A, - LKANM_BCK_DAMFLUP=0x6B, - LKANM_BCK_DAMFR=0x6C, - LKANM_BCK_DAMFRUP=0x6D, - LKANM_BCK_DAML=0x6E, - LKANM_BCK_DAMR=0x6F, - LKANM_BCK_DASH=0x70, - LKANM_BCK_DASHBOKO=0x71, - LKANM_BCK_DASHHAM=0x72, - LKANM_BCK_DASHKAZE=0x73, - LKANM_BCK_DASHS=0x74, - LKANM_BCK_DIELONG=0x75, - LKANM_BCK_DIFENCE=0x76, - LKANM_BCK_DIFENCEA=0x77, - LKANM_BCK_DIFENCEAHAM=0x78, - LKANM_BCK_DIFENCEHAM=0x79, - LKANM_BCK_DOOROPENALINK=0x7A, - LKANM_BCK_DOOROPENBLINK=0x7B, - LKANM_BCK_ESAMAKI=0x7C, - LKANM_BCK_EXCA1=0x7D, - LKANM_BCK_EXCA1A=0x7E, - LKANM_BCK_EXCA1MS=0x7F, - LKANM_BCK_EXCB1=0x80, - LKANM_BCK_EXCB1A=0x81, - LKANM_BCK_EXCB1MS=0x82, - LKANM_BCK_FANB2A=0x83, - LKANM_BCK_FANBA=0x84, - LKANM_BCK_FANWAIT=0x85, - LKANM_BCK_FCLIMBSLIDELUP=0x86, - LKANM_BCK_FCLIMBSLIDERUP=0x87, - LKANM_BCK_FM_BATA=0x88, - LKANM_BCK_FN_HAIR1=0x89, - LKANM_BCK_FREEA=0x8A, - LKANM_BCK_FREEB=0x8B, - LKANM_BCK_FREED=0x8C, - LKANM_BCK_GETLETTER=0x8D, - LKANM_BCK_GETLETTERA=0x8E, - LKANM_BCK_GLAD=0x8F, - LKANM_BCK_GRABNG=0x90, - LKANM_BCK_GRABP=0x91, - LKANM_BCK_GRABRE=0x92, - LKANM_BCK_GRABTHROW=0x93, - LKANM_BCK_GRABUP=0x94, - LKANM_BCK_GRABWAIT=0x95, - LKANM_BCK_GRABWAITB=0x96, - LKANM_BCK_HAMMERDAM=0x97, - LKANM_BCK_HAMSWINGA=0x98, - LKANM_BCK_HAMSWINGAA=0x99, - LKANM_BCK_HAMSWINGBEND=0x9A, - LKANM_BCK_HAMSWINGBHIT=0x9B, - LKANM_BCK_HAMSWINGBHITA=0x9C, - LKANM_BCK_HAMSWINGBPRE=0x9D, - LKANM_BCK_HAMSWINGBPREA=0x9E, - LKANM_BCK_HANGING=0x9F, - LKANM_BCK_HANGL=0xA0, - LKANM_BCK_HANGMOVEL=0xA1, - LKANM_BCK_HANGMOVER=0xA2, - LKANM_BCK_HANGUP=0xA3, - LKANM_BCK_HOLDUP=0xA4, - LKANM_BCK_HOOKSHOTA=0xA5, - LKANM_BCK_HOOKSHOTJMP=0xA6, - LKANM_BCK_HOOKSHOTWAIT=0xA7, - LKANM_BCK_ITEMGET=0xA8, - LKANM_BCK_JATTACK=0xA9, - LKANM_BCK_JATTACKLAND=0xAA, - LKANM_BCK_JATTCKCUT=0xAB, - LKANM_BCK_JATTCKCUTHAM=0xAC, - LKANM_BCK_JATTCKP=0xAD, - LKANM_BCK_JMPED=0xAE, - LKANM_BCK_JMPEDS=0xAF, - LKANM_BCK_JMPST=0xB0, - LKANM_BCK_KOSHIKAKE=0xB1, - LKANM_BCK_LADDERDWEDL=0xB2, - LKANM_BCK_LADDERDWEDR=0xB3, - LKANM_BCK_LADDERDWST=0xB4, - LKANM_BCK_LADDERLTOR=0xB5, - LKANM_BCK_LADDERRTOL=0xB6, - LKANM_BCK_LADDERUPEDL=0xB7, - LKANM_BCK_LADDERUPEDR=0xB8, - LKANM_BCK_LADDERUPST=0xB9, - LKANM_BCK_LANDDAMA=0xBA, - LKANM_BCK_LANDDAMAST=0xBB, - LKANM_BCK_LAVADAM=0xBC, - LKANM_BCK_LIE=0xBD, - LKANM_BCK_LIEFORWARD=0xBE, - LKANM_BCK_LINK_FREEZ=0xBF, - LKANM_BCK_LINK_MOGAKI=0xC0, - LKANM_BCK_LOOKUP=0xC1, - LKANM_BCK_MJMP=0xC2, - LKANM_BCK_MJMPC=0xC3, - LKANM_BCK_MJMPCA=0xC4, - LKANM_BCK_MJMPCMS=0xC5, - LKANM_BCK_MOGAKU1=0xC6, - LKANM_BCK_MROLLCA=0xC7, - LKANM_BCK_MROLLCMS=0xC8, - LKANM_BCK_MROLLL=0xC9, - LKANM_BCK_MROLLLC=0xCA, - LKANM_BCK_MROLLR=0xCB, - LKANM_BCK_MROLLRC=0xCC, - LKANM_BCK_MSTEPOVER=0xCD, - LKANM_BCK_MSTEPOVERA=0xCE, - LKANM_BCK_MSTEPOVERLAND=0xCF, - LKANM_BCK_NENRIKI=0xD0, - LKANM_BCK_PICKUP=0xD1, - LKANM_BCK_POWUP=0xD2, - LKANM_BCK_POWUPWAIT=0xD3, - LKANM_BCK_PRESENTATIONA=0xD4, - LKANM_BCK_PRESENTATIONAWAIT=0xD5, - LKANM_BCK_PRESENTATIONB=0xD6, - LKANM_BCK_REST=0xD7, - LKANM_BCK_RISE=0xD8, - LKANM_BCK_ROLLB=0xD9, - LKANM_BCK_ROLLBLAND=0xDA, - LKANM_BCK_ROLLF=0xDB, - LKANM_BCK_ROLLFMIS=0xDC, - LKANM_BCK_ROPECATCH=0xDD, - LKANM_BCK_ROPECLIMB=0xDE, - LKANM_BCK_ROPEDOWN=0xDF, - LKANM_BCK_ROPESWINGB=0xE0, - LKANM_BCK_ROPESWINGF=0xE1, - LKANM_BCK_ROPETHROW=0xE2, - LKANM_BCK_ROPETHROWCATCH=0xE3, - LKANM_BCK_ROPETHROWWAIT=0xE4, - LKANM_BCK_ROPEWAIT=0xE5, - LKANM_BCK_ROT=0xE6, - LKANM_BCK_SALTATION=0xE7, - LKANM_BCK_SALVLBAD=0xE8, - LKANM_BCK_SALVLGOOD=0xE9, - LKANM_BCK_SALVLR=0xEA, - LKANM_BCK_SALVLWAIT=0xEB, - LKANM_BCK_SALVRBAD=0xEC, - LKANM_BCK_SALVRGOOD=0xED, - LKANM_BCK_SALVRWAIT=0xEE, - LKANM_BCK_SEARESET=0xEF, - LKANM_BCK_SETBOOTS=0xF0, - LKANM_BCK_SETHYOINOMI=0xF1, - LKANM_BCK_SEYYES=0xF2, - LKANM_BCK_SHIP_JUMP1=0xF3, - LKANM_BCK_SHIP_JUMP2=0xF4, - LKANM_BCK_SHIPDIE=0xF5, - LKANM_BCK_SLIDEB=0xF6, - LKANM_BCK_SLIDEBLAND=0xF7, - LKANM_BCK_SLIDEF=0xF8, - LKANM_BCK_SLIDEFLAND=0xF9, - LKANM_BCK_SLIP=0xFA, - LKANM_BCK_SLIPICE=0xFB, - LKANM_BCK_SURPRISED=0xFC, - LKANM_BCK_SURPRISEDB=0xFD, - LKANM_BCK_SURPRISEDWAIT=0xFE, - LKANM_BCK_SWIMDIE=0xFF, - LKANM_BCK_SWIMING=0x100, - LKANM_BCK_SWIMP=0x101, - LKANM_BCK_SWIMWAIT=0x102, - LKANM_BCK_TAKE=0x103, - LKANM_BCK_TAKEBOTH=0x104, - LKANM_BCK_TAKEL=0x105, - LKANM_BCK_TAKER=0x106, - LKANM_BCK_TAKTAYATSURI=0x107, - LKANM_BCK_TAKTCHISIN=0x108, - LKANM_BCK_TAKTCHUYA=0x109, - LKANM_BCK_TAKTDGE=0x10A, - LKANM_BCK_TAKTFUJIN=0x10B, - LKANM_BCK_TAKTKAZE=0x10C, - LKANM_BCK_TAKTSIPPU=0x10D, - LKANM_BCK_TALKA=0x10E, - LKANM_BCK_TETOLACH=0x10F, - LKANM_BCK_TURNBACK=0x110, - LKANM_BCK_USEFANA=0x111, - LKANM_BCK_USEFANAA=0x112, - LKANM_BCK_USEFANB=0x113, - LKANM_BCK_USEFANB2=0x114, - LKANM_BCK_USETCEIVER=0x115, - LKANM_BCK_VJMP=0x116, - LKANM_BCK_VJMPCHA=0x117, - LKANM_BCK_VJMPCHB=0x118, - LKANM_BCK_VJMPCL=0x119, - LKANM_BCK_VOMITJMP=0x11A, - LKANM_BCK_VOYAGE1=0x11B, - LKANM_BCK_WAIT=0x11C, - LKANM_BCK_WAITATOB=0x11D, - LKANM_BCK_WAITAUCTION=0x11E, - LKANM_BCK_WAITB=0x11F, - LKANM_BCK_WAITBOKO=0x120, - LKANM_BCK_WAITHAM=0x121, - LKANM_BCK_WAITLETTER=0x122, - LKANM_BCK_WAITPICKUP=0x123, - LKANM_BCK_WAITPUSHPULL=0x124, - LKANM_BCK_WAITQ=0x125, - LKANM_BCK_WAITS=0x126, - LKANM_BCK_WAITTAKT=0x127, - LKANM_BCK_WAITTAKTLHANDD=0x128, - LKANM_BCK_WAITTAKTLHANDL=0x129, - LKANM_BCK_WAITTAKTLHANDR=0x12A, - LKANM_BCK_WAITTAKTLHANDU=0x12B, - LKANM_BCK_WAITTAKTRHANDL=0x12C, - LKANM_BCK_WAITTAKTRHANDR=0x12D, - LKANM_BCK_WALK=0x12E, - LKANM_BCK_WALKBARREL=0x12F, - LKANM_BCK_WALKBOKO=0x130, - LKANM_BCK_WALKHAM=0x131, - LKANM_BCK_WALKHBOOTS=0x132, - LKANM_BCK_WALKPULL=0x133, - LKANM_BCK_WALKPUSH=0x134, - LKANM_BCK_WALKS=0x135, - LKANM_BCK_WALKSLOPE=0x136, - LKANM_BCK_WALL=0x137, - LKANM_BCK_WALLDW=0x138, - LKANM_BCK_WALLHOLDUP=0x139, - LKANM_BCK_WALLHOLDUPDW=0x13A, - LKANM_BCK_WALLPL=0x13B, - LKANM_BCK_WALLPLDW=0x13C, - LKANM_BCK_WALLPR=0x13D, - LKANM_BCK_WALLPRDW=0x13E, - LKANM_BCK_WALLWL=0x13F, - LKANM_BCK_WALLWLDW=0x140, - LKANM_BCK_WALLWR=0x141, - LKANM_BCK_WALLWRDW=0x142, - LKANM_BCK_WARPIN=0x143, - LKANM_BCK_WARPOUT=0x144, - LKANM_BCK_WARPOUTFIRST=0x145, - LKANM_BCK_WHO=0x146, - LKANM_BCK_WINDL=0x147, - LKANM_BCK_WINDR=0x148, - LKANM_BCK_YOBU=0x149, - - /* BPK */ - LKANM_BPK_CUTFH=0x14C, - LKANM_BPK_CUTFM=0x14D, - - /* BRK */ - LKANM_BRK_CUTFH=0x150, - LKANM_BRK_CUTFM=0x151, - LKANM_BRK_TBINHO=0x152, - LKANM_BRK_TBINLIQUID=0x153, - LKANM_BRK_TTAKT=0x154, - LKANM_BRK_YHSLS00=0x155, - LKANM_BRK_YMSLI00=0x156, - - /* BTK */ - LKANM_BTK_CUTFH=0x159, - LKANM_BTK_CUTFM=0x15A, - LKANM_BTK_SALVWAIT=0x15B, - LKANM_BTK_SEARESET=0x15C, - LKANM_BTK_TABEKOBE=0x15D, - LKANM_BTK_TARROWRELORD=0x15E, - LKANM_BTK_TATNJL=0x15F, - LKANM_BTK_TATNJR=0x160, - LKANM_BTK_TBINDRINKAFTER=0x161, - LKANM_BTK_TBINDRINKAFTER2=0x162, - LKANM_BTK_TBINDRINKPRE=0x163, - LKANM_BTK_TBINGET=0x164, - LKANM_BTK_TBINOPENA=0x165, - LKANM_BTK_TBINOPENB=0x166, - LKANM_BTK_TBINOPENPRE=0x167, - LKANM_BTK_TBINSWING=0x168, - LKANM_BTK_TBOOMCATCH=0x169, - LKANM_BTK_TBOOMTHROW=0x16A, - LKANM_BTK_TBOTTLE=0x16B, - LKANM_BTK_TBOWWAIT=0x16C, - LKANM_BTK_TBOXOPENLINK=0x16D, - LKANM_BTK_TBOXOPENSHORTLINK=0x16E, - LKANM_BTK_TCOMEOUT=0x16F, - LKANM_BTK_TCUTBOKO=0x170, - LKANM_BTK_TCUTEA=0x171, - LKANM_BTK_TCUTKESA=0x172, - LKANM_BTK_TCUTRE=0x173, - LKANM_BTK_TCUTTURN=0x174, - LKANM_BTK_TCUTTURNB=0x175, - LKANM_BTK_TDAM=0x176, - LKANM_BTK_TDAMBIRI=0x177, - LKANM_BTK_TDAMFBUP=0x178, - LKANM_BTK_TDAMFFUP=0x179, - LKANM_BTK_TDAMFLUP=0x17A, - LKANM_BTK_TDAMFRUP=0x17B, - LKANM_BTK_TDASHKAZE=0x17C, - LKANM_BTK_TDIELONG=0x17D, - LKANM_BTK_TDOOROPENALINK=0x17E, - LKANM_BTK_TDOOROPENBLINK=0x17F, - LKANM_BTK_TECN=0x180, - LKANM_BTK_TEDL=0x181, - LKANM_BTK_TEDR=0x182, - LKANM_BTK_TEDW=0x183, - LKANM_BTK_TEL=0x184, - LKANM_BTK_TER=0x185, - LKANM_BTK_TEUL=0x186, - LKANM_BTK_TEUP=0x187, - LKANM_BTK_TEUR=0x188, - LKANM_BTK_TEXCA1=0x189, - LKANM_BTK_TEXCB1=0x18A, - LKANM_BTK_TEYORIME=0x18B, - LKANM_BTK_TFAN=0x18C, - LKANM_BTK_TFREEA=0x18D, - LKANM_BTK_TFREEB=0x18E, - LKANM_BTK_TFREED=0x18F, - LKANM_BTK_TGRABNG=0x190, - LKANM_BTK_TGRABP=0x191, - LKANM_BTK_TGRABTHROW=0x192, - LKANM_BTK_TGRABUP=0x193, - LKANM_BTK_TGUARD=0x194, - LKANM_BTK_THAMSWINGA=0x195, - LKANM_BTK_THAMSWINGBEND=0x196, - LKANM_BTK_THAMSWINGBHIT=0x197, - LKANM_BTK_THAMSWINGBPRE=0x198, - LKANM_BTK_THANGING=0x199, - LKANM_BTK_THANGUP=0x19A, - LKANM_BTK_THOOKSHOTJMP=0x19B, - LKANM_BTK_TITEMGET=0x19C, - LKANM_BTK_TJATTACK=0x19D, - LKANM_BTK_TJMP=0x19E, - LKANM_BTK_TLADDERDWED=0x19F, - LKANM_BTK_TLADDERDWST=0x1A0, - LKANM_BTK_TLADDERUPED=0x1A1, - LKANM_BTK_TLADDERUPST=0x1A2, - LKANM_BTK_TLANDDAMA=0x1A3, - LKANM_BTK_TLANDDAMAST=0x1A4, - LKANM_BTK_TLAVADAM=0x1A5, - LKANM_BTK_TLOOKUP=0x1A6, - LKANM_BTK_TMABA=0x1A7, - LKANM_BTK_TMJMP=0x1A8, - LKANM_BTK_TMJMPC=0x1A9, - LKANM_BTK_TMROLLL=0x1AA, - LKANM_BTK_TMROLLLC=0x1AB, - LKANM_BTK_TMROLLR=0x1AC, - LKANM_BTK_TMROLLRC=0x1AD, - LKANM_BTK_TMSTEPOVER=0x1AE, - LKANM_BTK_TMSTEPOVERA=0x1AF, - LKANM_BTK_TMSTEPOVERLAND=0x1B0, - LKANM_BTK_TPICKUP=0x1B1, - LKANM_BTK_TPOWUP=0x1B2, - LKANM_BTK_TPOWUPWAIT=0x1B3, - LKANM_BTK_TPRESENTATIONA=0x1B4, - LKANM_BTK_TPRESENTATIONB=0x1B5, - LKANM_BTK_TREST=0x1B6, - LKANM_BTK_TROLLB=0x1B7, - LKANM_BTK_TROLLF=0x1B8, - LKANM_BTK_TROLLFMIS=0x1B9, - LKANM_BTK_TSALTATION=0x1BA, - LKANM_BTK_TSETHYOINOMI=0x1BB, - LKANM_BTK_TSEYYES=0x1BC, - LKANM_BTK_TSLIDEF=0x1BD, - LKANM_BTK_TSLIDEFLAND=0x1BE, - LKANM_BTK_TSURPRISED=0x1BF, - LKANM_BTK_TSURPRISEDB=0x1C0, - LKANM_BTK_TSWIMING=0x1C1, - LKANM_BTK_TSWIMP=0x1C2, - LKANM_BTK_TSWMS=0x1C3, - LKANM_BTK_TTAKE=0x1C4, - LKANM_BTK_TTURNBACK=0x1C5, - LKANM_BTK_TUSEFANA=0x1C6, - LKANM_BTK_TUSEFANB=0x1C7, - LKANM_BTK_TVJMPCHA=0x1C8, - LKANM_BTK_TVJMPCL=0x1C9, - LKANM_BTK_TWAITATOB=0x1CA, - LKANM_BTK_TWAITPICKUP=0x1CB, - LKANM_BTK_TWALKPULL=0x1CC, - LKANM_BTK_TWALKPUSH=0x1CD, - LKANM_BTK_TWALLHOLDUP=0x1CE, - LKANM_BTK_TWALLPL=0x1CF, - LKANM_BTK_TWALLPR=0x1D0, - LKANM_BTK_TWALLWL=0x1D1, - LKANM_BTK_TWALLWR=0x1D2, - LKANM_BTK_TWARPIN=0x1D3, - LKANM_BTK_TWARPOUT=0x1D4, - LKANM_BTK_TWARPOUTFIRST=0x1D5, - LKANM_BTK_TWHO=0x1D6, - LKANM_BTK_TWINDL=0x1D7, - LKANM_BTK_TWINDR=0x1D8, - LKANM_BTK_YHSLS00=0x1D9, - LKANM_BTK_YMSLI00=0x1DA, - - /* BTP */ - LKANM_BTP_LINK_FREEZ=0x1DD, - LKANM_BTP_LINK_MOGAKI=0x1DE, - LKANM_BTP_SALVBAD=0x1DF, - LKANM_BTP_SALVGOOD=0x1E0, - LKANM_BTP_SALVLR=0x1E1, - LKANM_BTP_SALVWAIT=0x1E2, - LKANM_BTP_SEARESET=0x1E3, - LKANM_BTP_SHIP_JUMP1=0x1E4, - LKANM_BTP_SHIP_JUMP2=0x1E5, - LKANM_BTP_TARROWRELORD=0x1E6, - LKANM_BTP_TATNJLR=0x1E7, - LKANM_BTP_TBINDRINKAFTER=0x1E8, - LKANM_BTP_TBINDRINKAFTER2=0x1E9, - LKANM_BTP_TBINDRINKING=0x1EA, - LKANM_BTP_TBINDRINKING2=0x1EB, - LKANM_BTP_TBINDRINKPRE=0x1EC, - LKANM_BTP_TBINDRINKPRE2=0x1ED, - LKANM_BTP_TBINGET=0x1EE, - LKANM_BTP_TBINOPENA=0x1EF, - LKANM_BTP_TBINOPENB=0x1F0, - LKANM_BTP_TBINOPENPRE=0x1F1, - LKANM_BTP_TBINSWING=0x1F2, - LKANM_BTP_TBOOMCATCH=0x1F3, - LKANM_BTP_TBOOMTHROW=0x1F4, - LKANM_BTP_TBOWWAIT=0x1F5, - LKANM_BTP_TBOXOPENLINK=0x1F6, - LKANM_BTP_TBOXOPENSHORTLINK=0x1F7, - LKANM_BTP_TCOMEOUT=0x1F8, - LKANM_BTP_TCUT=0x1F9, - LKANM_BTP_TCUTBOKO=0x1FA, - LKANM_BTP_TCUTEA=0x1FB, - LKANM_BTP_TCUTKESA=0x1FC, - LKANM_BTP_TCUTRE=0x1FD, - LKANM_BTP_TCUTTURN=0x1FE, - LKANM_BTP_TCUTTURNB=0x1FF, - LKANM_BTP_TCUTTURNP=0x200, - LKANM_BTP_TDAM=0x201, - LKANM_BTP_TDAMBIRI=0x202, - LKANM_BTP_TDAMDASH=0x203, - LKANM_BTP_TDAMF=0x204, - LKANM_BTP_TDAMFBUP=0x205, - LKANM_BTP_TDAMFFUP=0x206, - LKANM_BTP_TDAMFLRUP=0x207, - LKANM_BTP_TDASHKAZE=0x208, - LKANM_BTP_TDIELONG=0x209, - LKANM_BTP_TDOOROPENALINK=0x20A, - LKANM_BTP_TDOOROPENBLINK=0x20B, - LKANM_BTP_TEXCA1=0x20C, - LKANM_BTP_TEXCB1=0x20D, - LKANM_BTP_TFALL=0x20E, - LKANM_BTP_TFAN=0x20F, - LKANM_BTP_TFREEA=0x210, - LKANM_BTP_TFREEB=0x211, - LKANM_BTP_TFREED=0x212, - LKANM_BTP_TGLAD=0x213, - LKANM_BTP_TGRABNG=0x214, - LKANM_BTP_TGRABP=0x215, - LKANM_BTP_TGRABRE=0x216, - LKANM_BTP_TGRABTHROW=0x217, - LKANM_BTP_TGRABUP=0x218, - LKANM_BTP_TGUARD=0x219, - LKANM_BTP_THAMSWINGA=0x21A, - LKANM_BTP_THAMSWINGBEND=0x21B, - LKANM_BTP_THAMSWINGBHIT=0x21C, - LKANM_BTP_THAMSWINGBPRE=0x21D, - LKANM_BTP_THANGING=0x21E, - LKANM_BTP_THANGUP=0x21F, - LKANM_BTP_THOLDUP=0x220, - LKANM_BTP_TITEMGET=0x221, - LKANM_BTP_TIYAYA=0x222, - LKANM_BTP_TJATTACK=0x223, - LKANM_BTP_TJMP=0x224, - LKANM_BTP_TLADDERDWED=0x225, - LKANM_BTP_TLADDERDWST=0x226, - LKANM_BTP_TLADDERUPED=0x227, - LKANM_BTP_TLADDERUPST=0x228, - LKANM_BTP_TLANDDAMA=0x229, - LKANM_BTP_TLANDDAMAST=0x22A, - LKANM_BTP_TLAVADAM=0x22B, - LKANM_BTP_TLOOKUP=0x22C, - LKANM_BTP_TMABAA=0x22D, - LKANM_BTP_TMABAB=0x22E, - LKANM_BTP_TMABAC=0x22F, - LKANM_BTP_TMABACB=0x230, - LKANM_BTP_TMABACC=0x231, - LKANM_BTP_TMABAD=0x232, - LKANM_BTP_TMABAE=0x233, - LKANM_BTP_TMABAF=0x234, - LKANM_BTP_TMABAG=0x235, - LKANM_BTP_TMABAH=0x236, - LKANM_BTP_TMABAI=0x237, - LKANM_BTP_TMABAJ=0x238, - LKANM_BTP_TMJMP=0x239, - LKANM_BTP_TMJMPC=0x23A, - LKANM_BTP_TMROLLL=0x23B, - LKANM_BTP_TMROLLLRC=0x23C, - LKANM_BTP_TMROLLR=0x23D, - LKANM_BTP_TMSTEPOVER=0x23E, - LKANM_BTP_TMSTEPOVERA=0x23F, - LKANM_BTP_TMSTEPOVERLAND=0x240, - LKANM_BTP_TNENRIKI=0x241, - LKANM_BTP_TPICKUP=0x242, - LKANM_BTP_TPOWUP=0x243, - LKANM_BTP_TPOWUPWAIT=0x244, - LKANM_BTP_TPRESENTATION=0x245, - LKANM_BTP_TREST=0x246, - LKANM_BTP_TROLLB=0x247, - LKANM_BTP_TROLLBLAND=0x248, - LKANM_BTP_TROLLF=0x249, - LKANM_BTP_TROLLFMIS=0x24A, - LKANM_BTP_TROPECLIMB=0x24B, - LKANM_BTP_TROPEDOWN=0x24C, - LKANM_BTP_TSALTATION=0x24D, - LKANM_BTP_TSETBOOTS=0x24E, - LKANM_BTP_TSETHYOINOMI=0x24F, - LKANM_BTP_TSEYYES=0x250, - LKANM_BTP_TSLIDEB=0x251, - LKANM_BTP_TSLIDEBLAND=0x252, - LKANM_BTP_TSLIDEF=0x253, - LKANM_BTP_TSLIDEFLAND=0x254, - LKANM_BTP_TSLIPICE=0x255, - LKANM_BTP_TSURPRISED=0x256, - LKANM_BTP_TSURPRISEDB=0x257, - LKANM_BTP_TSWIMDIE=0x258, - LKANM_BTP_TSWIMING=0x259, - LKANM_BTP_TSWIMP=0x25A, - LKANM_BTP_TTAKE=0x25B, - LKANM_BTP_TTAKELR=0x25C, - LKANM_BTP_TTAKTAYATSURI=0x25D, - LKANM_BTP_TTAKTCHISIN=0x25E, - LKANM_BTP_TTAKTCHUYA=0x25F, - LKANM_BTP_TTAKTFUJIN=0x260, - LKANM_BTP_TTAKTKAZE=0x261, - LKANM_BTP_TTAKTSIPPU=0x262, - LKANM_BTP_TTURNBACK=0x263, - LKANM_BTP_TUSEFANA=0x264, - LKANM_BTP_TUSEFANB=0x265, - LKANM_BTP_TUSEFANB2=0x266, - LKANM_BTP_TVJMPCHA=0x267, - LKANM_BTP_TVJMPCL=0x268, - LKANM_BTP_TVOMITJMP=0x269, - LKANM_BTP_TWAITATOB=0x26A, - LKANM_BTP_TWAITQ=0x26B, - LKANM_BTP_TWALKPULL=0x26C, - LKANM_BTP_TWALKPUSH=0x26D, - LKANM_BTP_TWALLHOLDUP=0x26E, - LKANM_BTP_TWALLPL=0x26F, - LKANM_BTP_TWALLPR=0x270, - LKANM_BTP_TWALLWL=0x271, - LKANM_BTP_TWALLWR=0x272, - LKANM_BTP_TWARPIN=0x273, - LKANM_BTP_TWARPOUT=0x274, - LKANM_BTP_TWARPOUTFIRST=0x275, - LKANM_BTP_TWHO=0x276, - LKANM_BTP_TWIND=0x277, - - /* DAT */ - LKANM__BTJUMPCUT_POS=0x27A, - LKANM__BTROTATECUTL_POS=0x27B, - LKANM__BTROTATECUTR_POS=0x27C, - LKANM__CUTA_POS=0x27D, - LKANM__CUTBOKO_POS=0x27E, - LKANM__CUTEA_POS=0x27F, - LKANM__CUTEB_POS=0x280, - LKANM__CUTEXA_POS=0x281, - LKANM__CUTEXB_POS=0x282, - LKANM__CUTJUMP_POS=0x283, - LKANM__CUTKESA_POS=0x284, - LKANM__CUTL_POS=0x285, - LKANM__CUTR_POS=0x286, - LKANM__CUTTURN_POS=0x287, - LKANM__HAMMERFRONT_POS=0x288, - LKANM__HAMMERSIDE_POS=0x289, - LKANM__LASTCOMBO_POS=0x28A, - LKANM__WEAPONJUMP_POS=0x28B, - LKANM__WEAPONTURN_POS=0x28C, -}; - class daPy_lk_c : public daPy_py_c { public: enum daPy_PROC { diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h index fc2321726..2f70eb105 100644 --- a/include/d/d_com_inf_game.h +++ b/include/d/d_com_inf_game.h @@ -17,6 +17,7 @@ #include "d/d_vibration.h" #include "d/d_demo.h" #include "d/d_timer.h" +#include "d/res/res_always.h" #include "SSystem/SComponent/c_data_tbl.h" class JKRArchive; @@ -58,163 +59,6 @@ enum daPy__PlayerStatus1 { daPyStts1_UNK40000_e = 0x00040000, }; -enum ALWAYS_RES_FILE_ID { // IDs and indexes are synced - /* BCK */ - ALWAYS_BCK_FA=0xC, - ALWAYS_BCK_OBM_SYOUGEKISW=0xD, - ALWAYS_BCK_START=0xE, - ALWAYS_BCK_VBELL=0xF, - ALWAYS_BCK_VBOKL=0x10, - ALWAYS_BCK_VCHUL=0x11, - ALWAYS_BCK_VDOKL=0x12, - ALWAYS_BCK_VESAL=0x13, - ALWAYS_BCK_VHANL=0x14, - ALWAYS_BCK_VHAPL=0x15, - ALWAYS_BCK_W_PILLAR_A=0x16, - ALWAYS_BCK_YJ_DELETE=0x17, - ALWAYS_BCK_YJ_IN=0x18, - ALWAYS_BCK_YJ_LOOP=0x19, - ALWAYS_BCK_YJ_OUT=0x1A, - ALWAYS_BCK_YJ_SCALE=0x1B, - - /* BDL */ - ALWAYS_BDL_ARROWITEM=0x1E, - ALWAYS_BDL_FA=0x1F, - ALWAYS_BDL_KROCK_00=0x20, - ALWAYS_BDL_OBM_KOISI1=0x21, - ALWAYS_BDL_OBM_KOISI2=0x22, - ALWAYS_BDL_OBM_KOTUBO1=0x23, - ALWAYS_BDL_OBM_OOTUBO1=0x24, - ALWAYS_BDL_VBELL=0x25, - ALWAYS_BDL_VBOKL=0x26, - ALWAYS_BDL_VDOKL=0x27, - ALWAYS_BDL_VESAL=0x28, - ALWAYS_BDL_VHAPL=0x29, - ALWAYS_BDL_VHRTL=0x2A, - ALWAYS_BDL_VKEYL=0x2B, - - /* BDLM */ - ALWAYS_BDL_IB=0x2E, - ALWAYS_BDL_MPA_SIMI=0x2F, - ALWAYS_BDL_MPI_KOISHI=0x30, - ALWAYS_BDL_MPM_TUBO=0x31, - ALWAYS_BDL_MPODA=0x32, - ALWAYS_BDL_MPODB=0x33, - ALWAYS_BDL_NH=0x34, - ALWAYS_BDL_OBM_SYOUGEKISW=0x35, - ALWAYS_BDL_VCHUL=0x36, - ALWAYS_BDL_VHANL=0x37, - ALWAYS_BDL_VHKAL=0x38, - ALWAYS_BDL_VHUTL=0x39, - ALWAYS_BDL_VLUPL=0x3A, - ALWAYS_BDL_W_PILLAR_A=0x3B, - ALWAYS_BDL_YA=0x3C, - ALWAYS_BDL_YAZIRUSHI_01=0x3D, - ALWAYS_BDL_YTHDR00=0x3E, - - /* BMTM */ - ALWAYS_BMT_ICE=0x41, - - /* BPK */ - ALWAYS_BPK_YJ_DELETE=0x44, - ALWAYS_BPK_YJ_IN=0x45, - ALWAYS_BPK_YJ_LOOP=0x46, - ALWAYS_BPK_YJ_OUT=0x47, - ALWAYS_BPK_YJ_SCALE=0x48, - - /* BRK */ - ALWAYS_BRK_IB_01=0x4B, - ALWAYS_BRK_IB_02=0x4C, - ALWAYS_BRK_MPA_SIMI=0x4D, - ALWAYS_BRK_TNH=0x4E, - ALWAYS_BRK_VCHUL=0x4F, - ALWAYS_BRK_VHANL=0x50, - ALWAYS_BRK_VLUPL=0x51, - ALWAYS_BRK_YTHDR00=0x52, - - /* BTK */ - ALWAYS_BTK_EFA_USONAMI_01=0x55, - ALWAYS_BTK_IB=0x56, - ALWAYS_BTK_ICE=0x57, - ALWAYS_BTK_OBM_SYOUGEKISW=0x58, - ALWAYS_BTK_VBELL=0x59, - ALWAYS_BTK_VHANL=0x5A, - ALWAYS_BTK_VHKAL=0x5B, - ALWAYS_BTK_VHUTL=0x5C, - ALWAYS_BTK_VLUPL=0x5D, - ALWAYS_BTK_W_PILLAR_A=0x5E, - ALWAYS_BTK_YA=0x5F, - ALWAYS_BTK_YTHDR00=0x60, - - /* BTP */ - ALWAYS_BTP_MPA_SIMI=0x63, - ALWAYS_BTP_MPI_KIBAKO_TARU=0x64, - ALWAYS_BTP_MPI_KINOHAHEN=0x65, - ALWAYS_BTP_MPI_KOISHI=0x66, - ALWAYS_BTP_MPM_TUBO=0x67, - - /* DAT */ - ALWAYS_BIN_ITEM_TABLE=0x6A, - - /* TEX */ - ALWAYS_BTI_AK_HOUSHI00=0x6D, - ALWAYS_BTI_AK_SMOKE01=0x6E, - ALWAYS_BTI_B_SEA_TEX0AND2=0x6F, - ALWAYS_BTI_B_WYURAYURA_TEX1=0x70, - ALWAYS_I4_BALL128B=0x71, - ALWAYS_BTI_BLACK_WHITE_2=0x72, - ALWAYS_BTI_CAMERA_FREE=0x73, - ALWAYS_BTI_CAMERA_SELF=0x74, - ALWAYS_BTI_F_SHIPICON=0x75, - ALWAYS_CI4_MAP08G=0x76, - ALWAYS_CI4_MAP16G=0x77, - ALWAYS_BTI_MAP_BLACK_CI8=0x78, - ALWAYS_BTI_MAP_CHECK16_CI4=0x79, - ALWAYS_BTI_MAP_FRAME1=0x7A, - ALWAYS_BTI_MAP_FRAME2=0x7B, - ALWAYS_BTI_MAP_FRAME3=0x7C, - ALWAYS_BTI_MAP_FRAME4=0x7D, - ALWAYS_BTI_ROPE=0x7E, - ALWAYS_BTI_SHMREF=0x7F, - ALWAYS_BTI_TREASUREBOX=0x80, - ALWAYS_I8_TX_SNOW01=0x81, - ALWAYS_BTI_TXA_LENS_32HALF=0x82, - ALWAYS_BTI_TXA_MOYA_A_64=0x83, - ALWAYS_BTI_TXA_MOYA_B_64=0x84, - ALWAYS_BTI_TXA_RING_A_32HAFE=0x85, - ALWAYS_BTI_TXA_TAIYO=0x86, - ALWAYS_BTI_TXA_TUKI_AS=0x87, - ALWAYS_BTI_TXA_TUKI_BS=0x88, - ALWAYS_BTI_TXA_TUKI_CS=0x89, - ALWAYS_BTI_TXA_TUKI_DS=0x8A, - ALWAYS_BTI_TXA_USONAMI_256_64MIP=0x8B, - ALWAYS_BTI_TXA_USONAMI_M_256_64MIP=0x8C, - ALWAYS_BTI_TXM_ROPE1=0x8D, - ALWAYS_BTI_UMIPT=0x8E, -}; - -enum CLOTH_RES_FILE_ID { // IDs and indexes are synced - /* TEX */ - CLOTH_BTI_CLOTHTOON=0x3, -}; - -enum VBAKH_RES_FILE_ID { // IDs and indexes are synced - /* BCK */ - VBAKH_BCK_VBAHX=0x5, - VBAKH_BCK_VBAKH=0x6, - VBAKH_BCK_VBAKM=0x7, - VBAKH_BCK_VBAMX=0x8, - - /* BDLM */ - VBAKH_BDL_VBAKH=0xB, - VBAKH_BDL_VBAKM=0xC, - - /* BRK */ - VBAKH_BRK_VBAHX=0xF, - VBAKH_BRK_VBAKM=0x10, - VBAKH_BRK_VBAMX=0x11, -}; - class __d_timer_info_c { public: __d_timer_info_c() { @@ -560,7 +404,7 @@ public: JKRExpHeap* getExpHeap2D() { return mpExpHeap2D; } void setExpHeap2D(void* heap) { mpExpHeap2D = (JKRExpHeap*)heap; } - inline u8 getHeapLockFlag() { return mHeapLockFlag; } + inline u8 isHeapLockFlag() { return mHeapLockFlag; } inline void setHeapLockFlag(u8 flag) { mHeapLockFlag = flag; } inline void offHeapLockFlag() { mHeapLockFlag = 0; } @@ -2459,8 +2303,8 @@ inline dADM_CharTbl* dComIfGp_CharTbl() { inline JKRExpHeap* dComIfGp_getExpHeap2D() { return g_dComIfG_gameInfo.play.getExpHeap2D(); } inline void dComIfGp_setExpHeap2D(void* heap) { g_dComIfG_gameInfo.play.setExpHeap2D(heap); } -inline u8 dComIfGp_getHeapLockFlag() { - return g_dComIfG_gameInfo.play.getHeapLockFlag(); +inline u8 dComIfGp_isHeapLockFlag() { + return g_dComIfG_gameInfo.play.isHeapLockFlag(); } inline void dComIfGp_setHeapLockFlag(u8 flag) { @@ -2559,14 +2403,6 @@ inline u8 dComIfGp_event_getPreItemNo() { return g_dComIfG_gameInfo.play.getEvent().getPreItemNo(); } -inline void dComIfGp_event_setItemPartnerId(unsigned int id) { - g_dComIfG_gameInfo.play.getEvent().setPtI_Id(id); -} - -inline void dComIfGp_event_setItemPartner(void* pt) { - g_dComIfG_gameInfo.play.getEvent().setPtI(pt); -} - inline void dComIfGp_event_setGtItm(u8 itemNo) { g_dComIfG_gameInfo.play.getEvent().setGtItm(itemNo); } @@ -2603,6 +2439,14 @@ inline fopAc_ac_c* dComIfGp_event_getItemPartner() { return (fopAc_ac_c*)g_dComIfG_gameInfo.play.getEvent().getPtI(); } +inline void dComIfGp_event_setItemPartner(void* pt) { + g_dComIfG_gameInfo.play.getEvent().setPtI(pt); +} + +inline void dComIfGp_event_setItemPartnerId(unsigned int id) { + g_dComIfG_gameInfo.play.getEvent().setPtI_Id(id); +} + inline fopAc_ac_c* dComIfGp_event_getPt1() { return (fopAc_ac_c*)g_dComIfG_gameInfo.play.getEvent().getPt1(); } diff --git a/include/d/d_place_name.h b/include/d/d_place_name.h index d1461999b..7c628ab96 100644 --- a/include/d/d_place_name.h +++ b/include/d/d_place_name.h @@ -15,6 +15,12 @@ public: BOOL _closeAnime(); virtual void draw(); + void addCounter() {} + void decCounter() {} + void getCounter() {} + void changeTexture(const ResTIMG*) {} + void deleteScreen() {} + public: /* 0x04 */ J2DScreen * scrn; /* 0x08 */ fopMsgM_pane_class pane; diff --git a/include/d/res/res_always.h b/include/d/res/res_always.h new file mode 100644 index 000000000..9a8d39115 --- /dev/null +++ b/include/d/res/res_always.h @@ -0,0 +1,139 @@ +#ifndef RES_ALWAYS_H +#define RES_ALWAYS_H + +enum ALWAYS_RES_FILE_ID { // IDs and indexes are synced + /* BCK */ + ALWAYS_BCK_FA=0xC, + ALWAYS_BCK_OBM_SYOUGEKISW=0xD, + ALWAYS_BCK_START=0xE, + ALWAYS_BCK_VBELL=0xF, + ALWAYS_BCK_VBOKL=0x10, + ALWAYS_BCK_VCHUL=0x11, + ALWAYS_BCK_VDOKL=0x12, + ALWAYS_BCK_VESAL=0x13, + ALWAYS_BCK_VHANL=0x14, + ALWAYS_BCK_VHAPL=0x15, + ALWAYS_BCK_W_PILLAR_A=0x16, + ALWAYS_BCK_YJ_DELETE=0x17, + ALWAYS_BCK_YJ_IN=0x18, + ALWAYS_BCK_YJ_LOOP=0x19, + ALWAYS_BCK_YJ_OUT=0x1A, + ALWAYS_BCK_YJ_SCALE=0x1B, + + /* BDL */ + ALWAYS_BDL_ARROWITEM=0x1E, + ALWAYS_BDL_FA=0x1F, + ALWAYS_BDL_KROCK_00=0x20, + ALWAYS_BDL_OBM_KOISI1=0x21, + ALWAYS_BDL_OBM_KOISI2=0x22, + ALWAYS_BDL_OBM_KOTUBO1=0x23, + ALWAYS_BDL_OBM_OOTUBO1=0x24, + ALWAYS_BDL_VBELL=0x25, + ALWAYS_BDL_VBOKL=0x26, + ALWAYS_BDL_VDOKL=0x27, + ALWAYS_BDL_VESAL=0x28, + ALWAYS_BDL_VHAPL=0x29, + ALWAYS_BDL_VHRTL=0x2A, + ALWAYS_BDL_VKEYL=0x2B, + + /* BDLM */ + ALWAYS_BDL_IB=0x2E, + ALWAYS_BDL_MPA_SIMI=0x2F, + ALWAYS_BDL_MPI_KOISHI=0x30, + ALWAYS_BDL_MPM_TUBO=0x31, + ALWAYS_BDL_MPODA=0x32, + ALWAYS_BDL_MPODB=0x33, + ALWAYS_BDL_NH=0x34, + ALWAYS_BDL_OBM_SYOUGEKISW=0x35, + ALWAYS_BDL_VCHUL=0x36, + ALWAYS_BDL_VHANL=0x37, + ALWAYS_BDL_VHKAL=0x38, + ALWAYS_BDL_VHUTL=0x39, + ALWAYS_BDL_VLUPL=0x3A, + ALWAYS_BDL_W_PILLAR_A=0x3B, + ALWAYS_BDL_YA=0x3C, + ALWAYS_BDL_YAZIRUSHI_01=0x3D, + ALWAYS_BDL_YTHDR00=0x3E, + + /* BMTM */ + ALWAYS_BMT_ICE=0x41, + + /* BPK */ + ALWAYS_BPK_YJ_DELETE=0x44, + ALWAYS_BPK_YJ_IN=0x45, + ALWAYS_BPK_YJ_LOOP=0x46, + ALWAYS_BPK_YJ_OUT=0x47, + ALWAYS_BPK_YJ_SCALE=0x48, + + /* BRK */ + ALWAYS_BRK_IB_01=0x4B, + ALWAYS_BRK_IB_02=0x4C, + ALWAYS_BRK_MPA_SIMI=0x4D, + ALWAYS_BRK_TNH=0x4E, + ALWAYS_BRK_VCHUL=0x4F, + ALWAYS_BRK_VHANL=0x50, + ALWAYS_BRK_VLUPL=0x51, + ALWAYS_BRK_YTHDR00=0x52, + + /* BTK */ + ALWAYS_BTK_EFA_USONAMI_01=0x55, + ALWAYS_BTK_IB=0x56, + ALWAYS_BTK_ICE=0x57, + ALWAYS_BTK_OBM_SYOUGEKISW=0x58, + ALWAYS_BTK_VBELL=0x59, + ALWAYS_BTK_VHANL=0x5A, + ALWAYS_BTK_VHKAL=0x5B, + ALWAYS_BTK_VHUTL=0x5C, + ALWAYS_BTK_VLUPL=0x5D, + ALWAYS_BTK_W_PILLAR_A=0x5E, + ALWAYS_BTK_YA=0x5F, + ALWAYS_BTK_YTHDR00=0x60, + + /* BTP */ + ALWAYS_BTP_MPA_SIMI=0x63, + ALWAYS_BTP_MPI_KIBAKO_TARU=0x64, + ALWAYS_BTP_MPI_KINOHAHEN=0x65, + ALWAYS_BTP_MPI_KOISHI=0x66, + ALWAYS_BTP_MPM_TUBO=0x67, + + /* DAT */ + ALWAYS_BIN_ITEM_TABLE=0x6A, + + /* TEX */ + ALWAYS_BTI_AK_HOUSHI00=0x6D, + ALWAYS_BTI_AK_SMOKE01=0x6E, + ALWAYS_BTI_B_SEA_TEX0AND2=0x6F, + ALWAYS_BTI_B_WYURAYURA_TEX1=0x70, + ALWAYS_I4_BALL128B=0x71, + ALWAYS_BTI_BLACK_WHITE_2=0x72, + ALWAYS_BTI_CAMERA_FREE=0x73, + ALWAYS_BTI_CAMERA_SELF=0x74, + ALWAYS_BTI_F_SHIPICON=0x75, + ALWAYS_CI4_MAP08G=0x76, + ALWAYS_CI4_MAP16G=0x77, + ALWAYS_BTI_MAP_BLACK_CI8=0x78, + ALWAYS_BTI_MAP_CHECK16_CI4=0x79, + ALWAYS_BTI_MAP_FRAME1=0x7A, + ALWAYS_BTI_MAP_FRAME2=0x7B, + ALWAYS_BTI_MAP_FRAME3=0x7C, + ALWAYS_BTI_MAP_FRAME4=0x7D, + ALWAYS_BTI_ROPE=0x7E, + ALWAYS_BTI_SHMREF=0x7F, + ALWAYS_BTI_TREASUREBOX=0x80, + ALWAYS_I8_TX_SNOW01=0x81, + ALWAYS_BTI_TXA_LENS_32HALF=0x82, + ALWAYS_BTI_TXA_MOYA_A_64=0x83, + ALWAYS_BTI_TXA_MOYA_B_64=0x84, + ALWAYS_BTI_TXA_RING_A_32HAFE=0x85, + ALWAYS_BTI_TXA_TAIYO=0x86, + ALWAYS_BTI_TXA_TUKI_AS=0x87, + ALWAYS_BTI_TXA_TUKI_BS=0x88, + ALWAYS_BTI_TXA_TUKI_CS=0x89, + ALWAYS_BTI_TXA_TUKI_DS=0x8A, + ALWAYS_BTI_TXA_USONAMI_256_64MIP=0x8B, + ALWAYS_BTI_TXA_USONAMI_M_256_64MIP=0x8C, + ALWAYS_BTI_TXM_ROPE1=0x8D, + ALWAYS_BTI_UMIPT=0x8E, +}; + +#endif /* RES_ALWAYS_H */ diff --git a/include/d/res/res_cloth.h b/include/d/res/res_cloth.h new file mode 100644 index 000000000..5876875ef --- /dev/null +++ b/include/d/res/res_cloth.h @@ -0,0 +1,9 @@ +#ifndef RES_CLOTH_H +#define RES_CLOTH_H + +enum CLOTH_RES_FILE_ID { // IDs and indexes are synced + /* TEX */ + CLOTH_BTI_CLOTHTOON=0x3, +}; + +#endif /* RES_CLOTH_H */ diff --git a/include/d/res/res_link.h b/include/d/res/res_link.h new file mode 100644 index 000000000..a62feb185 --- /dev/null +++ b/include/d/res/res_link.h @@ -0,0 +1,113 @@ +#ifndef RES_LINK_H +#define RES_LINK_H + +enum LINK_RES_FILE_ID { // IDs and indexes are synced + /* BCK */ + LINK_BCK_ATNGSHA=0xA, + LINK_BCK_BOMB=0xB, + LINK_BCK_COMBO_TATE=0xC, + LINK_BCK_GICER01=0xD, + LINK_BCK_GWP00=0xE, + LINK_BCK_SWGRIPMSAB=0xF, + LINK_BCK_YUCHW00=0x10, + + /* BDL */ + LINK_BDL_BINFAIRY=0x13, + LINK_BDL_BOOMERANG=0x14, + LINK_BDL_BOTTLECAP=0x15, + LINK_BDL_BOW=0x16, + LINK_BDL_CAMERA=0x17, + LINK_BDL_CL=0x18, + LINK_BDL_FAN=0x19, + LINK_BDL_FANB=0x1A, + LINK_BDL_FANSMALL=0x1B, + LINK_BDL_HAMMER=0x1C, + LINK_BDL_HANDS=0x1D, + LINK_BDL_HOOKSHOT=0x1E, + LINK_BDL_HYOINOMI=0x1F, + LINK_BDL_KATSURA=0x20, + LINK_BDL_LETTER=0x21, + LINK_BDL_PODMS=0x22, + LINK_BDL_PRING=0x23, + LINK_BDL_SHA=0x24, + LINK_BDL_SWA=0x25, + LINK_BDL_SWGRIPA=0x26, + LINK_BDL_TCEIVER=0x27, + LINK_BDL_TETOLACH=0x28, + LINK_BDL_YAMU=0x29, + + /* BDLC */ + LINK_BDL_ESA=0x2C, + LINK_BDL_HBOOTS=0x2D, + LINK_BDL_ROPEEND=0x2E, + LINK_BDL_TELESCOPE=0x2F, + + /* BDLI */ + LINK_BDL_GARWFI00=0x32, + LINK_BDL_GARWFI01=0x33, + LINK_BDL_GARWG00=0x34, + + /* BDLM */ + LINK_BDL_ARROW=0x37, + LINK_BDL_ARROWGLITTER=0x38, + LINK_BDL_BINHO=0x39, + LINK_BDL_BINLIQUID=0x3A, + LINK_BDL_BINLIQUIDH=0x3B, + LINK_BDL_BOMB=0x3C, + LINK_BDL_BOTTLEEMP=0x3D, + LINK_BDL_CUTFH=0x3E, + LINK_BDL_CUTFM=0x3F, + LINK_BDL_GICER00=0x40, + LINK_BDL_GICER01=0x41, + LINK_BDL_GWP00=0x42, + LINK_BDL_SHMS=0x43, + LINK_BDL_SUIMEN_MUNYA=0x44, + LINK_BDL_SWGRIPMS=0x45, + LINK_BDL_SWMS=0x46, + LINK_BDL_TAKT=0x47, + LINK_BDL_YAURA00=0x48, + LINK_BDL_YBAFO00=0x49, + LINK_BDL_YHSLS00=0x4A, + LINK_BDL_YMGCS00=0x4B, + LINK_BDL_YMSLI00=0x4C, + LINK_BDL_YMSLS00=0x4D, + LINK_BDL_YUCHW00=0x4E, + + /* BRK */ + LINK_BRK_BOMB=0x51, + LINK_BRK_GARWFI00=0x52, + LINK_BRK_GARWFI01=0x53, + LINK_BRK_GARWG00=0x54, + LINK_BRK_GWP00=0x55, + LINK_BRK_TSWGRIPMSAB=0x56, + LINK_BRK_YAURA00_G=0x57, + LINK_BRK_YAURA00_R=0x58, + LINK_BRK_YMGCS00_MS=0x59, + LINK_BRK_YMGCS00_TS=0x5A, + LINK_BRK_YUCHW00=0x5B, + + /* BTK */ + LINK_BTK_GARWFI00=0x5E, + LINK_BTK_GARWFI01=0x5F, + LINK_BTK_GARWG00=0x60, + LINK_BTK_GICER00=0x61, + LINK_BTK_GICER01=0x62, + LINK_BTK_GWP00=0x63, + LINK_BTK_SUIMEN_MUNYA=0x64, + LINK_BTK_TARROWGLITTER=0x65, + LINK_BTK_TSHMS=0x66, + LINK_BTK_TSWGRIPMS=0x67, + LINK_BTK_TTIPICE=0x68, + LINK_BTK_YAURA00=0x69, + LINK_BTK_YBAFO00=0x6A, + LINK_BTK_YMGCS00=0x6B, + LINK_BTK_YMSLS00=0x6C, + LINK_BTK_YUCHW00=0x6D, + + /* TEX */ + LINK_BTI_BLUR=0x70, + LINK_BTI_LINKTEXBCI4=0x71, + LINK_BTI_ROCK_MARK=0x72, +}; + +#endif /* RES_LINK_H */ diff --git a/include/d/res/res_lkanm.h b/include/d/res/res_lkanm.h new file mode 100644 index 000000000..2dd8bd003 --- /dev/null +++ b/include/d/res/res_lkanm.h @@ -0,0 +1,653 @@ +#ifndef RES_LKANM_H +#define RES_LKANM_H + +enum LKANM_RES_FILE_ID { // IDs and indexes are synced + /* BCKS */ + LKANM_BCK_ACTIONTAKTRDW=0x8, + LKANM_BCK_ACTIONTAKTRL=0x9, + LKANM_BCK_ACTIONTAKTRR=0xA, + LKANM_BCK_ACTIONTAKTRUP=0xB, + LKANM_BCK_ARROWRELORD=0xC, + LKANM_BCK_ARROWRELORDA=0xD, + LKANM_BCK_ARROWSHOOT=0xE, + LKANM_BCK_ARROWSHOOTA=0xF, + LKANM_BCK_ATNBOKO=0x10, + LKANM_BCK_ATNDB=0x11, + LKANM_BCK_ATNDL=0x12, + LKANM_BCK_ATNDLS=0x13, + LKANM_BCK_ATNDR=0x14, + LKANM_BCK_ATNDRS=0x15, + LKANM_BCK_ATNG=0x16, + LKANM_BCK_ATNGAHAM=0x17, + LKANM_BCK_ATNGAHAMA=0x18, + LKANM_BCK_ATNGAL=0x19, + LKANM_BCK_ATNGAR=0x1A, + LKANM_BCK_ATNGHAM=0x1B, + LKANM_BCK_ATNHAM=0x1C, + LKANM_BCK_ATNJL=0x1D, + LKANM_BCK_ATNJLLAND=0x1E, + LKANM_BCK_ATNJR=0x1F, + LKANM_BCK_ATNJRLAND=0x20, + LKANM_BCK_ATNL=0x21, + LKANM_BCK_ATNLS=0x22, + LKANM_BCK_ATNR=0x23, + LKANM_BCK_ATNRS=0x24, + LKANM_BCK_ATNWB=0x25, + LKANM_BCK_ATNWL=0x26, + LKANM_BCK_ATNWLS=0x27, + LKANM_BCK_ATNWR=0x28, + LKANM_BCK_ATNWRS=0x29, + LKANM_BCK_BINDRINKAFTER=0x2A, + LKANM_BCK_BINDRINKING=0x2B, + LKANM_BCK_BINDRINKPRE=0x2C, + LKANM_BCK_BINGET=0x2D, + LKANM_BCK_BINOPENA=0x2E, + LKANM_BCK_BINOPENB=0x2F, + LKANM_BCK_BINOPENPRE=0x30, + LKANM_BCK_BINSWINGS=0x31, + LKANM_BCK_BINSWINGU=0x32, + LKANM_BCK_BOOMCATCH=0x33, + LKANM_BCK_BOOMTHROW=0x34, + LKANM_BCK_BOOMWAIT=0x35, + LKANM_BCK_BOWWAIT=0x36, + LKANM_BCK_BOWWAITA=0x37, + LKANM_BCK_BOXOPENLINK=0x38, + LKANM_BCK_BOXOPENSHORTLINK=0x39, + LKANM_BCK_BOXOPENSLINK=0x3A, + LKANM_BCK_COMBO_KEN=0x3B, + LKANM_BCK_COMBO_LINK=0x3C, + LKANM_BCK_COMEOUT=0x3D, + LKANM_BCK_CROUCH=0x3E, + LKANM_BCK_CUTA=0x3F, + LKANM_BCK_CUTAA=0x40, + LKANM_BCK_CUTAMS=0x41, + LKANM_BCK_CUTBOKO=0x42, + LKANM_BCK_CUTEA=0x43, + LKANM_BCK_CUTEAA=0x44, + LKANM_BCK_CUTEAMS=0x45, + LKANM_BCK_CUTEB=0x46, + LKANM_BCK_CUTEBA=0x47, + LKANM_BCK_CUTEBMS=0x48, + LKANM_BCK_CUTF=0x49, + LKANM_BCK_CUTFA=0x4A, + LKANM_BCK_CUTFMS=0x4B, + LKANM_BCK_CUTKESA=0x4C, + LKANM_BCK_CUTKESAA=0x4D, + LKANM_BCK_CUTKESAMS=0x4E, + LKANM_BCK_CUTL=0x4F, + LKANM_BCK_CUTLA=0x50, + LKANM_BCK_CUTLMS=0x51, + LKANM_BCK_CUTR=0x52, + LKANM_BCK_CUTRA=0x53, + LKANM_BCK_CUTREHAM=0x54, + LKANM_BCK_CUTREL=0x55, + LKANM_BCK_CUTRER=0x56, + LKANM_BCK_CUTRMS=0x57, + LKANM_BCK_CUTTURN=0x58, + LKANM_BCK_CUTTURNA=0x59, + LKANM_BCK_CUTTURNB=0x5A, + LKANM_BCK_CUTTURNC=0x5B, + LKANM_BCK_CUTTURNMS=0x5C, + LKANM_BCK_CUTTURNP=0x5D, + LKANM_BCK_CUTTURNPB=0x5E, + LKANM_BCK_CUTTURNPWFB=0x5F, + LKANM_BCK_CUTTURNPWLR=0x60, + LKANM_BCK_DAM=0x61, + LKANM_BCK_DAMB=0x62, + LKANM_BCK_DAMBIRI=0x63, + LKANM_BCK_DAMDASH=0x64, + LKANM_BCK_DAMF=0x65, + LKANM_BCK_DAMFB=0x66, + LKANM_BCK_DAMFBUP=0x67, + LKANM_BCK_DAMFF=0x68, + LKANM_BCK_DAMFFUP=0x69, + LKANM_BCK_DAMFL=0x6A, + LKANM_BCK_DAMFLUP=0x6B, + LKANM_BCK_DAMFR=0x6C, + LKANM_BCK_DAMFRUP=0x6D, + LKANM_BCK_DAML=0x6E, + LKANM_BCK_DAMR=0x6F, + LKANM_BCK_DASH=0x70, + LKANM_BCK_DASHBOKO=0x71, + LKANM_BCK_DASHHAM=0x72, + LKANM_BCK_DASHKAZE=0x73, + LKANM_BCK_DASHS=0x74, + LKANM_BCK_DIELONG=0x75, + LKANM_BCK_DIFENCE=0x76, + LKANM_BCK_DIFENCEA=0x77, + LKANM_BCK_DIFENCEAHAM=0x78, + LKANM_BCK_DIFENCEHAM=0x79, + LKANM_BCK_DOOROPENALINK=0x7A, + LKANM_BCK_DOOROPENBLINK=0x7B, + LKANM_BCK_ESAMAKI=0x7C, + LKANM_BCK_EXCA1=0x7D, + LKANM_BCK_EXCA1A=0x7E, + LKANM_BCK_EXCA1MS=0x7F, + LKANM_BCK_EXCB1=0x80, + LKANM_BCK_EXCB1A=0x81, + LKANM_BCK_EXCB1MS=0x82, + LKANM_BCK_FANB2A=0x83, + LKANM_BCK_FANBA=0x84, + LKANM_BCK_FANWAIT=0x85, + LKANM_BCK_FCLIMBSLIDELUP=0x86, + LKANM_BCK_FCLIMBSLIDERUP=0x87, + LKANM_BCK_FM_BATA=0x88, + LKANM_BCK_FN_HAIR1=0x89, + LKANM_BCK_FREEA=0x8A, + LKANM_BCK_FREEB=0x8B, + LKANM_BCK_FREED=0x8C, + LKANM_BCK_GETLETTER=0x8D, + LKANM_BCK_GETLETTERA=0x8E, + LKANM_BCK_GLAD=0x8F, + LKANM_BCK_GRABNG=0x90, + LKANM_BCK_GRABP=0x91, + LKANM_BCK_GRABRE=0x92, + LKANM_BCK_GRABTHROW=0x93, + LKANM_BCK_GRABUP=0x94, + LKANM_BCK_GRABWAIT=0x95, + LKANM_BCK_GRABWAITB=0x96, + LKANM_BCK_HAMMERDAM=0x97, + LKANM_BCK_HAMSWINGA=0x98, + LKANM_BCK_HAMSWINGAA=0x99, + LKANM_BCK_HAMSWINGBEND=0x9A, + LKANM_BCK_HAMSWINGBHIT=0x9B, + LKANM_BCK_HAMSWINGBHITA=0x9C, + LKANM_BCK_HAMSWINGBPRE=0x9D, + LKANM_BCK_HAMSWINGBPREA=0x9E, + LKANM_BCK_HANGING=0x9F, + LKANM_BCK_HANGL=0xA0, + LKANM_BCK_HANGMOVEL=0xA1, + LKANM_BCK_HANGMOVER=0xA2, + LKANM_BCK_HANGUP=0xA3, + LKANM_BCK_HOLDUP=0xA4, + LKANM_BCK_HOOKSHOTA=0xA5, + LKANM_BCK_HOOKSHOTJMP=0xA6, + LKANM_BCK_HOOKSHOTWAIT=0xA7, + LKANM_BCK_ITEMGET=0xA8, + LKANM_BCK_JATTACK=0xA9, + LKANM_BCK_JATTACKLAND=0xAA, + LKANM_BCK_JATTCKCUT=0xAB, + LKANM_BCK_JATTCKCUTHAM=0xAC, + LKANM_BCK_JATTCKP=0xAD, + LKANM_BCK_JMPED=0xAE, + LKANM_BCK_JMPEDS=0xAF, + LKANM_BCK_JMPST=0xB0, + LKANM_BCK_KOSHIKAKE=0xB1, + LKANM_BCK_LADDERDWEDL=0xB2, + LKANM_BCK_LADDERDWEDR=0xB3, + LKANM_BCK_LADDERDWST=0xB4, + LKANM_BCK_LADDERLTOR=0xB5, + LKANM_BCK_LADDERRTOL=0xB6, + LKANM_BCK_LADDERUPEDL=0xB7, + LKANM_BCK_LADDERUPEDR=0xB8, + LKANM_BCK_LADDERUPST=0xB9, + LKANM_BCK_LANDDAMA=0xBA, + LKANM_BCK_LANDDAMAST=0xBB, + LKANM_BCK_LAVADAM=0xBC, + LKANM_BCK_LIE=0xBD, + LKANM_BCK_LIEFORWARD=0xBE, + LKANM_BCK_LINK_FREEZ=0xBF, + LKANM_BCK_LINK_MOGAKI=0xC0, + LKANM_BCK_LOOKUP=0xC1, + LKANM_BCK_MJMP=0xC2, + LKANM_BCK_MJMPC=0xC3, + LKANM_BCK_MJMPCA=0xC4, + LKANM_BCK_MJMPCMS=0xC5, + LKANM_BCK_MOGAKU1=0xC6, + LKANM_BCK_MROLLCA=0xC7, + LKANM_BCK_MROLLCMS=0xC8, + LKANM_BCK_MROLLL=0xC9, + LKANM_BCK_MROLLLC=0xCA, + LKANM_BCK_MROLLR=0xCB, + LKANM_BCK_MROLLRC=0xCC, + LKANM_BCK_MSTEPOVER=0xCD, + LKANM_BCK_MSTEPOVERA=0xCE, + LKANM_BCK_MSTEPOVERLAND=0xCF, + LKANM_BCK_NENRIKI=0xD0, + LKANM_BCK_PICKUP=0xD1, + LKANM_BCK_POWUP=0xD2, + LKANM_BCK_POWUPWAIT=0xD3, + LKANM_BCK_PRESENTATIONA=0xD4, + LKANM_BCK_PRESENTATIONAWAIT=0xD5, + LKANM_BCK_PRESENTATIONB=0xD6, + LKANM_BCK_REST=0xD7, + LKANM_BCK_RISE=0xD8, + LKANM_BCK_ROLLB=0xD9, + LKANM_BCK_ROLLBLAND=0xDA, + LKANM_BCK_ROLLF=0xDB, + LKANM_BCK_ROLLFMIS=0xDC, + LKANM_BCK_ROPECATCH=0xDD, + LKANM_BCK_ROPECLIMB=0xDE, + LKANM_BCK_ROPEDOWN=0xDF, + LKANM_BCK_ROPESWINGB=0xE0, + LKANM_BCK_ROPESWINGF=0xE1, + LKANM_BCK_ROPETHROW=0xE2, + LKANM_BCK_ROPETHROWCATCH=0xE3, + LKANM_BCK_ROPETHROWWAIT=0xE4, + LKANM_BCK_ROPEWAIT=0xE5, + LKANM_BCK_ROT=0xE6, + LKANM_BCK_SALTATION=0xE7, + LKANM_BCK_SALVLBAD=0xE8, + LKANM_BCK_SALVLGOOD=0xE9, + LKANM_BCK_SALVLR=0xEA, + LKANM_BCK_SALVLWAIT=0xEB, + LKANM_BCK_SALVRBAD=0xEC, + LKANM_BCK_SALVRGOOD=0xED, + LKANM_BCK_SALVRWAIT=0xEE, + LKANM_BCK_SEARESET=0xEF, + LKANM_BCK_SETBOOTS=0xF0, + LKANM_BCK_SETHYOINOMI=0xF1, + LKANM_BCK_SEYYES=0xF2, + LKANM_BCK_SHIP_JUMP1=0xF3, + LKANM_BCK_SHIP_JUMP2=0xF4, + LKANM_BCK_SHIPDIE=0xF5, + LKANM_BCK_SLIDEB=0xF6, + LKANM_BCK_SLIDEBLAND=0xF7, + LKANM_BCK_SLIDEF=0xF8, + LKANM_BCK_SLIDEFLAND=0xF9, + LKANM_BCK_SLIP=0xFA, + LKANM_BCK_SLIPICE=0xFB, + LKANM_BCK_SURPRISED=0xFC, + LKANM_BCK_SURPRISEDB=0xFD, + LKANM_BCK_SURPRISEDWAIT=0xFE, + LKANM_BCK_SWIMDIE=0xFF, + LKANM_BCK_SWIMING=0x100, + LKANM_BCK_SWIMP=0x101, + LKANM_BCK_SWIMWAIT=0x102, + LKANM_BCK_TAKE=0x103, + LKANM_BCK_TAKEBOTH=0x104, + LKANM_BCK_TAKEL=0x105, + LKANM_BCK_TAKER=0x106, + LKANM_BCK_TAKTAYATSURI=0x107, + LKANM_BCK_TAKTCHISIN=0x108, + LKANM_BCK_TAKTCHUYA=0x109, + LKANM_BCK_TAKTDGE=0x10A, + LKANM_BCK_TAKTFUJIN=0x10B, + LKANM_BCK_TAKTKAZE=0x10C, + LKANM_BCK_TAKTSIPPU=0x10D, + LKANM_BCK_TALKA=0x10E, + LKANM_BCK_TETOLACH=0x10F, + LKANM_BCK_TURNBACK=0x110, + LKANM_BCK_USEFANA=0x111, + LKANM_BCK_USEFANAA=0x112, + LKANM_BCK_USEFANB=0x113, + LKANM_BCK_USEFANB2=0x114, + LKANM_BCK_USETCEIVER=0x115, + LKANM_BCK_VJMP=0x116, + LKANM_BCK_VJMPCHA=0x117, + LKANM_BCK_VJMPCHB=0x118, + LKANM_BCK_VJMPCL=0x119, + LKANM_BCK_VOMITJMP=0x11A, + LKANM_BCK_VOYAGE1=0x11B, + LKANM_BCK_WAIT=0x11C, + LKANM_BCK_WAITATOB=0x11D, + LKANM_BCK_WAITAUCTION=0x11E, + LKANM_BCK_WAITB=0x11F, + LKANM_BCK_WAITBOKO=0x120, + LKANM_BCK_WAITHAM=0x121, + LKANM_BCK_WAITLETTER=0x122, + LKANM_BCK_WAITPICKUP=0x123, + LKANM_BCK_WAITPUSHPULL=0x124, + LKANM_BCK_WAITQ=0x125, + LKANM_BCK_WAITS=0x126, + LKANM_BCK_WAITTAKT=0x127, + LKANM_BCK_WAITTAKTLHANDD=0x128, + LKANM_BCK_WAITTAKTLHANDL=0x129, + LKANM_BCK_WAITTAKTLHANDR=0x12A, + LKANM_BCK_WAITTAKTLHANDU=0x12B, + LKANM_BCK_WAITTAKTRHANDL=0x12C, + LKANM_BCK_WAITTAKTRHANDR=0x12D, + LKANM_BCK_WALK=0x12E, + LKANM_BCK_WALKBARREL=0x12F, + LKANM_BCK_WALKBOKO=0x130, + LKANM_BCK_WALKHAM=0x131, + LKANM_BCK_WALKHBOOTS=0x132, + LKANM_BCK_WALKPULL=0x133, + LKANM_BCK_WALKPUSH=0x134, + LKANM_BCK_WALKS=0x135, + LKANM_BCK_WALKSLOPE=0x136, + LKANM_BCK_WALL=0x137, + LKANM_BCK_WALLDW=0x138, + LKANM_BCK_WALLHOLDUP=0x139, + LKANM_BCK_WALLHOLDUPDW=0x13A, + LKANM_BCK_WALLPL=0x13B, + LKANM_BCK_WALLPLDW=0x13C, + LKANM_BCK_WALLPR=0x13D, + LKANM_BCK_WALLPRDW=0x13E, + LKANM_BCK_WALLWL=0x13F, + LKANM_BCK_WALLWLDW=0x140, + LKANM_BCK_WALLWR=0x141, + LKANM_BCK_WALLWRDW=0x142, + LKANM_BCK_WARPIN=0x143, + LKANM_BCK_WARPOUT=0x144, + LKANM_BCK_WARPOUTFIRST=0x145, + LKANM_BCK_WHO=0x146, + LKANM_BCK_WINDL=0x147, + LKANM_BCK_WINDR=0x148, + LKANM_BCK_YOBU=0x149, + + /* BPK */ + LKANM_BPK_CUTFH=0x14C, + LKANM_BPK_CUTFM=0x14D, + + /* BRK */ + LKANM_BRK_CUTFH=0x150, + LKANM_BRK_CUTFM=0x151, + LKANM_BRK_TBINHO=0x152, + LKANM_BRK_TBINLIQUID=0x153, + LKANM_BRK_TTAKT=0x154, + LKANM_BRK_YHSLS00=0x155, + LKANM_BRK_YMSLI00=0x156, + + /* BTK */ + LKANM_BTK_CUTFH=0x159, + LKANM_BTK_CUTFM=0x15A, + LKANM_BTK_SALVWAIT=0x15B, + LKANM_BTK_SEARESET=0x15C, + LKANM_BTK_TABEKOBE=0x15D, + LKANM_BTK_TARROWRELORD=0x15E, + LKANM_BTK_TATNJL=0x15F, + LKANM_BTK_TATNJR=0x160, + LKANM_BTK_TBINDRINKAFTER=0x161, + LKANM_BTK_TBINDRINKAFTER2=0x162, + LKANM_BTK_TBINDRINKPRE=0x163, + LKANM_BTK_TBINGET=0x164, + LKANM_BTK_TBINOPENA=0x165, + LKANM_BTK_TBINOPENB=0x166, + LKANM_BTK_TBINOPENPRE=0x167, + LKANM_BTK_TBINSWING=0x168, + LKANM_BTK_TBOOMCATCH=0x169, + LKANM_BTK_TBOOMTHROW=0x16A, + LKANM_BTK_TBOTTLE=0x16B, + LKANM_BTK_TBOWWAIT=0x16C, + LKANM_BTK_TBOXOPENLINK=0x16D, + LKANM_BTK_TBOXOPENSHORTLINK=0x16E, + LKANM_BTK_TCOMEOUT=0x16F, + LKANM_BTK_TCUTBOKO=0x170, + LKANM_BTK_TCUTEA=0x171, + LKANM_BTK_TCUTKESA=0x172, + LKANM_BTK_TCUTRE=0x173, + LKANM_BTK_TCUTTURN=0x174, + LKANM_BTK_TCUTTURNB=0x175, + LKANM_BTK_TDAM=0x176, + LKANM_BTK_TDAMBIRI=0x177, + LKANM_BTK_TDAMFBUP=0x178, + LKANM_BTK_TDAMFFUP=0x179, + LKANM_BTK_TDAMFLUP=0x17A, + LKANM_BTK_TDAMFRUP=0x17B, + LKANM_BTK_TDASHKAZE=0x17C, + LKANM_BTK_TDIELONG=0x17D, + LKANM_BTK_TDOOROPENALINK=0x17E, + LKANM_BTK_TDOOROPENBLINK=0x17F, + LKANM_BTK_TECN=0x180, + LKANM_BTK_TEDL=0x181, + LKANM_BTK_TEDR=0x182, + LKANM_BTK_TEDW=0x183, + LKANM_BTK_TEL=0x184, + LKANM_BTK_TER=0x185, + LKANM_BTK_TEUL=0x186, + LKANM_BTK_TEUP=0x187, + LKANM_BTK_TEUR=0x188, + LKANM_BTK_TEXCA1=0x189, + LKANM_BTK_TEXCB1=0x18A, + LKANM_BTK_TEYORIME=0x18B, + LKANM_BTK_TFAN=0x18C, + LKANM_BTK_TFREEA=0x18D, + LKANM_BTK_TFREEB=0x18E, + LKANM_BTK_TFREED=0x18F, + LKANM_BTK_TGRABNG=0x190, + LKANM_BTK_TGRABP=0x191, + LKANM_BTK_TGRABTHROW=0x192, + LKANM_BTK_TGRABUP=0x193, + LKANM_BTK_TGUARD=0x194, + LKANM_BTK_THAMSWINGA=0x195, + LKANM_BTK_THAMSWINGBEND=0x196, + LKANM_BTK_THAMSWINGBHIT=0x197, + LKANM_BTK_THAMSWINGBPRE=0x198, + LKANM_BTK_THANGING=0x199, + LKANM_BTK_THANGUP=0x19A, + LKANM_BTK_THOOKSHOTJMP=0x19B, + LKANM_BTK_TITEMGET=0x19C, + LKANM_BTK_TJATTACK=0x19D, + LKANM_BTK_TJMP=0x19E, + LKANM_BTK_TLADDERDWED=0x19F, + LKANM_BTK_TLADDERDWST=0x1A0, + LKANM_BTK_TLADDERUPED=0x1A1, + LKANM_BTK_TLADDERUPST=0x1A2, + LKANM_BTK_TLANDDAMA=0x1A3, + LKANM_BTK_TLANDDAMAST=0x1A4, + LKANM_BTK_TLAVADAM=0x1A5, + LKANM_BTK_TLOOKUP=0x1A6, + LKANM_BTK_TMABA=0x1A7, + LKANM_BTK_TMJMP=0x1A8, + LKANM_BTK_TMJMPC=0x1A9, + LKANM_BTK_TMROLLL=0x1AA, + LKANM_BTK_TMROLLLC=0x1AB, + LKANM_BTK_TMROLLR=0x1AC, + LKANM_BTK_TMROLLRC=0x1AD, + LKANM_BTK_TMSTEPOVER=0x1AE, + LKANM_BTK_TMSTEPOVERA=0x1AF, + LKANM_BTK_TMSTEPOVERLAND=0x1B0, + LKANM_BTK_TPICKUP=0x1B1, + LKANM_BTK_TPOWUP=0x1B2, + LKANM_BTK_TPOWUPWAIT=0x1B3, + LKANM_BTK_TPRESENTATIONA=0x1B4, + LKANM_BTK_TPRESENTATIONB=0x1B5, + LKANM_BTK_TREST=0x1B6, + LKANM_BTK_TROLLB=0x1B7, + LKANM_BTK_TROLLF=0x1B8, + LKANM_BTK_TROLLFMIS=0x1B9, + LKANM_BTK_TSALTATION=0x1BA, + LKANM_BTK_TSETHYOINOMI=0x1BB, + LKANM_BTK_TSEYYES=0x1BC, + LKANM_BTK_TSLIDEF=0x1BD, + LKANM_BTK_TSLIDEFLAND=0x1BE, + LKANM_BTK_TSURPRISED=0x1BF, + LKANM_BTK_TSURPRISEDB=0x1C0, + LKANM_BTK_TSWIMING=0x1C1, + LKANM_BTK_TSWIMP=0x1C2, + LKANM_BTK_TSWMS=0x1C3, + LKANM_BTK_TTAKE=0x1C4, + LKANM_BTK_TTURNBACK=0x1C5, + LKANM_BTK_TUSEFANA=0x1C6, + LKANM_BTK_TUSEFANB=0x1C7, + LKANM_BTK_TVJMPCHA=0x1C8, + LKANM_BTK_TVJMPCL=0x1C9, + LKANM_BTK_TWAITATOB=0x1CA, + LKANM_BTK_TWAITPICKUP=0x1CB, + LKANM_BTK_TWALKPULL=0x1CC, + LKANM_BTK_TWALKPUSH=0x1CD, + LKANM_BTK_TWALLHOLDUP=0x1CE, + LKANM_BTK_TWALLPL=0x1CF, + LKANM_BTK_TWALLPR=0x1D0, + LKANM_BTK_TWALLWL=0x1D1, + LKANM_BTK_TWALLWR=0x1D2, + LKANM_BTK_TWARPIN=0x1D3, + LKANM_BTK_TWARPOUT=0x1D4, + LKANM_BTK_TWARPOUTFIRST=0x1D5, + LKANM_BTK_TWHO=0x1D6, + LKANM_BTK_TWINDL=0x1D7, + LKANM_BTK_TWINDR=0x1D8, + LKANM_BTK_YHSLS00=0x1D9, + LKANM_BTK_YMSLI00=0x1DA, + + /* BTP */ + LKANM_BTP_LINK_FREEZ=0x1DD, + LKANM_BTP_LINK_MOGAKI=0x1DE, + LKANM_BTP_SALVBAD=0x1DF, + LKANM_BTP_SALVGOOD=0x1E0, + LKANM_BTP_SALVLR=0x1E1, + LKANM_BTP_SALVWAIT=0x1E2, + LKANM_BTP_SEARESET=0x1E3, + LKANM_BTP_SHIP_JUMP1=0x1E4, + LKANM_BTP_SHIP_JUMP2=0x1E5, + LKANM_BTP_TARROWRELORD=0x1E6, + LKANM_BTP_TATNJLR=0x1E7, + LKANM_BTP_TBINDRINKAFTER=0x1E8, + LKANM_BTP_TBINDRINKAFTER2=0x1E9, + LKANM_BTP_TBINDRINKING=0x1EA, + LKANM_BTP_TBINDRINKING2=0x1EB, + LKANM_BTP_TBINDRINKPRE=0x1EC, + LKANM_BTP_TBINDRINKPRE2=0x1ED, + LKANM_BTP_TBINGET=0x1EE, + LKANM_BTP_TBINOPENA=0x1EF, + LKANM_BTP_TBINOPENB=0x1F0, + LKANM_BTP_TBINOPENPRE=0x1F1, + LKANM_BTP_TBINSWING=0x1F2, + LKANM_BTP_TBOOMCATCH=0x1F3, + LKANM_BTP_TBOOMTHROW=0x1F4, + LKANM_BTP_TBOWWAIT=0x1F5, + LKANM_BTP_TBOXOPENLINK=0x1F6, + LKANM_BTP_TBOXOPENSHORTLINK=0x1F7, + LKANM_BTP_TCOMEOUT=0x1F8, + LKANM_BTP_TCUT=0x1F9, + LKANM_BTP_TCUTBOKO=0x1FA, + LKANM_BTP_TCUTEA=0x1FB, + LKANM_BTP_TCUTKESA=0x1FC, + LKANM_BTP_TCUTRE=0x1FD, + LKANM_BTP_TCUTTURN=0x1FE, + LKANM_BTP_TCUTTURNB=0x1FF, + LKANM_BTP_TCUTTURNP=0x200, + LKANM_BTP_TDAM=0x201, + LKANM_BTP_TDAMBIRI=0x202, + LKANM_BTP_TDAMDASH=0x203, + LKANM_BTP_TDAMF=0x204, + LKANM_BTP_TDAMFBUP=0x205, + LKANM_BTP_TDAMFFUP=0x206, + LKANM_BTP_TDAMFLRUP=0x207, + LKANM_BTP_TDASHKAZE=0x208, + LKANM_BTP_TDIELONG=0x209, + LKANM_BTP_TDOOROPENALINK=0x20A, + LKANM_BTP_TDOOROPENBLINK=0x20B, + LKANM_BTP_TEXCA1=0x20C, + LKANM_BTP_TEXCB1=0x20D, + LKANM_BTP_TFALL=0x20E, + LKANM_BTP_TFAN=0x20F, + LKANM_BTP_TFREEA=0x210, + LKANM_BTP_TFREEB=0x211, + LKANM_BTP_TFREED=0x212, + LKANM_BTP_TGLAD=0x213, + LKANM_BTP_TGRABNG=0x214, + LKANM_BTP_TGRABP=0x215, + LKANM_BTP_TGRABRE=0x216, + LKANM_BTP_TGRABTHROW=0x217, + LKANM_BTP_TGRABUP=0x218, + LKANM_BTP_TGUARD=0x219, + LKANM_BTP_THAMSWINGA=0x21A, + LKANM_BTP_THAMSWINGBEND=0x21B, + LKANM_BTP_THAMSWINGBHIT=0x21C, + LKANM_BTP_THAMSWINGBPRE=0x21D, + LKANM_BTP_THANGING=0x21E, + LKANM_BTP_THANGUP=0x21F, + LKANM_BTP_THOLDUP=0x220, + LKANM_BTP_TITEMGET=0x221, + LKANM_BTP_TIYAYA=0x222, + LKANM_BTP_TJATTACK=0x223, + LKANM_BTP_TJMP=0x224, + LKANM_BTP_TLADDERDWED=0x225, + LKANM_BTP_TLADDERDWST=0x226, + LKANM_BTP_TLADDERUPED=0x227, + LKANM_BTP_TLADDERUPST=0x228, + LKANM_BTP_TLANDDAMA=0x229, + LKANM_BTP_TLANDDAMAST=0x22A, + LKANM_BTP_TLAVADAM=0x22B, + LKANM_BTP_TLOOKUP=0x22C, + LKANM_BTP_TMABAA=0x22D, + LKANM_BTP_TMABAB=0x22E, + LKANM_BTP_TMABAC=0x22F, + LKANM_BTP_TMABACB=0x230, + LKANM_BTP_TMABACC=0x231, + LKANM_BTP_TMABAD=0x232, + LKANM_BTP_TMABAE=0x233, + LKANM_BTP_TMABAF=0x234, + LKANM_BTP_TMABAG=0x235, + LKANM_BTP_TMABAH=0x236, + LKANM_BTP_TMABAI=0x237, + LKANM_BTP_TMABAJ=0x238, + LKANM_BTP_TMJMP=0x239, + LKANM_BTP_TMJMPC=0x23A, + LKANM_BTP_TMROLLL=0x23B, + LKANM_BTP_TMROLLLRC=0x23C, + LKANM_BTP_TMROLLR=0x23D, + LKANM_BTP_TMSTEPOVER=0x23E, + LKANM_BTP_TMSTEPOVERA=0x23F, + LKANM_BTP_TMSTEPOVERLAND=0x240, + LKANM_BTP_TNENRIKI=0x241, + LKANM_BTP_TPICKUP=0x242, + LKANM_BTP_TPOWUP=0x243, + LKANM_BTP_TPOWUPWAIT=0x244, + LKANM_BTP_TPRESENTATION=0x245, + LKANM_BTP_TREST=0x246, + LKANM_BTP_TROLLB=0x247, + LKANM_BTP_TROLLBLAND=0x248, + LKANM_BTP_TROLLF=0x249, + LKANM_BTP_TROLLFMIS=0x24A, + LKANM_BTP_TROPECLIMB=0x24B, + LKANM_BTP_TROPEDOWN=0x24C, + LKANM_BTP_TSALTATION=0x24D, + LKANM_BTP_TSETBOOTS=0x24E, + LKANM_BTP_TSETHYOINOMI=0x24F, + LKANM_BTP_TSEYYES=0x250, + LKANM_BTP_TSLIDEB=0x251, + LKANM_BTP_TSLIDEBLAND=0x252, + LKANM_BTP_TSLIDEF=0x253, + LKANM_BTP_TSLIDEFLAND=0x254, + LKANM_BTP_TSLIPICE=0x255, + LKANM_BTP_TSURPRISED=0x256, + LKANM_BTP_TSURPRISEDB=0x257, + LKANM_BTP_TSWIMDIE=0x258, + LKANM_BTP_TSWIMING=0x259, + LKANM_BTP_TSWIMP=0x25A, + LKANM_BTP_TTAKE=0x25B, + LKANM_BTP_TTAKELR=0x25C, + LKANM_BTP_TTAKTAYATSURI=0x25D, + LKANM_BTP_TTAKTCHISIN=0x25E, + LKANM_BTP_TTAKTCHUYA=0x25F, + LKANM_BTP_TTAKTFUJIN=0x260, + LKANM_BTP_TTAKTKAZE=0x261, + LKANM_BTP_TTAKTSIPPU=0x262, + LKANM_BTP_TTURNBACK=0x263, + LKANM_BTP_TUSEFANA=0x264, + LKANM_BTP_TUSEFANB=0x265, + LKANM_BTP_TUSEFANB2=0x266, + LKANM_BTP_TVJMPCHA=0x267, + LKANM_BTP_TVJMPCL=0x268, + LKANM_BTP_TVOMITJMP=0x269, + LKANM_BTP_TWAITATOB=0x26A, + LKANM_BTP_TWAITQ=0x26B, + LKANM_BTP_TWALKPULL=0x26C, + LKANM_BTP_TWALKPUSH=0x26D, + LKANM_BTP_TWALLHOLDUP=0x26E, + LKANM_BTP_TWALLPL=0x26F, + LKANM_BTP_TWALLPR=0x270, + LKANM_BTP_TWALLWL=0x271, + LKANM_BTP_TWALLWR=0x272, + LKANM_BTP_TWARPIN=0x273, + LKANM_BTP_TWARPOUT=0x274, + LKANM_BTP_TWARPOUTFIRST=0x275, + LKANM_BTP_TWHO=0x276, + LKANM_BTP_TWIND=0x277, + + /* DAT */ + LKANM__BTJUMPCUT_POS=0x27A, + LKANM__BTROTATECUTL_POS=0x27B, + LKANM__BTROTATECUTR_POS=0x27C, + LKANM__CUTA_POS=0x27D, + LKANM__CUTBOKO_POS=0x27E, + LKANM__CUTEA_POS=0x27F, + LKANM__CUTEB_POS=0x280, + LKANM__CUTEXA_POS=0x281, + LKANM__CUTEXB_POS=0x282, + LKANM__CUTJUMP_POS=0x283, + LKANM__CUTKESA_POS=0x284, + LKANM__CUTL_POS=0x285, + LKANM__CUTR_POS=0x286, + LKANM__CUTTURN_POS=0x287, + LKANM__HAMMERFRONT_POS=0x288, + LKANM__HAMMERSIDE_POS=0x289, + LKANM__LASTCOMBO_POS=0x28A, + LKANM__WEAPONJUMP_POS=0x28B, + LKANM__WEAPONTURN_POS=0x28C, +}; + +#endif /* RES_LKANM_H */ diff --git a/include/d/res/res_vbakh.h b/include/d/res/res_vbakh.h new file mode 100644 index 000000000..ea1c007ca --- /dev/null +++ b/include/d/res/res_vbakh.h @@ -0,0 +1,21 @@ +#ifndef RES_VBAKH_H +#define RES_VBAKH_H + +enum VBAKH_RES_FILE_ID { // IDs and indexes are synced + /* BCK */ + VBAKH_BCK_VBAHX=0x5, + VBAKH_BCK_VBAKH=0x6, + VBAKH_BCK_VBAKM=0x7, + VBAKH_BCK_VBAMX=0x8, + + /* BDLM */ + VBAKH_BDL_VBAKH=0xB, + VBAKH_BDL_VBAKM=0xC, + + /* BRK */ + VBAKH_BRK_VBAHX=0xF, + VBAKH_BRK_VBAKM=0x10, + VBAKH_BRK_VBAMX=0x11, +}; + +#endif /* RES_VBAKH_H */ diff --git a/src/d/actor/d_a_bomb2.cpp b/src/d/actor/d_a_bomb2.cpp index 96509e212..f2699cb58 100644 --- a/src/d/actor/d_a_bomb2.cpp +++ b/src/d/actor/d_a_bomb2.cpp @@ -12,6 +12,7 @@ #include "d/d_com_inf_game.h" #include "d/actor/d_a_sea.h" #include "d/actor/d_a_player.h" +#include "d/res/res_vbakh.h" // Needed for the .data section to match. static f32 dummy1[3] = {1.0f, 1.0f, 1.0f}; diff --git a/src/d/actor/d_a_bomb3.inc b/src/d/actor/d_a_bomb3.inc index d02429667..403d90b68 100644 --- a/src/d/actor/d_a_bomb3.inc +++ b/src/d/actor/d_a_bomb3.inc @@ -13,6 +13,7 @@ #include "f_op/f_op_kankyo_mng.h" #include "m_Do/m_Do_mtx.h" #include "m_Do/m_Do_lib.h" +#include "d/res/res_vbakh.h" // Needed for the .data section to match. static f32 dummy1[3] = {1.0f, 1.0f, 1.0f}; diff --git a/src/d/actor/d_a_ghostship.cpp b/src/d/actor/d_a_ghostship.cpp index cc35a9a5f..aee058426 100644 --- a/src/d/actor/d_a_ghostship.cpp +++ b/src/d/actor/d_a_ghostship.cpp @@ -10,6 +10,7 @@ #include "d/d_com_inf_game.h" #include "d/d_s_play.h" #include "d/d_kankyo_wether.h" +#include "d/res/res_cloth.h" enum AYUSH_RES_FILE_ID { // IDs and indexes are synced /* BDLM */ diff --git a/src/d/actor/d_a_kytag05.cpp b/src/d/actor/d_a_kytag05.cpp index 10ebf493f..e60d83568 100644 --- a/src/d/actor/d_a_kytag05.cpp +++ b/src/d/actor/d_a_kytag05.cpp @@ -50,8 +50,7 @@ static BOOL daKytag05_Execute(kytag05_class* a_this) { return TRUE; } - if (dComIfGp_event_runCheck() && dComIfGp_evmng_startCheck("demo41") && - g_dComIfG_gameInfo.play.getDemo()) { + if (dComIfGp_event_runCheck() && dComIfGp_evmng_startCheck("demo41") && dComIfGp_demo_get()) { u32 demoFrame = dComIfGp_demo_get()->getFrame(); if(demoFrame >= 0x186) { f32 fVar7 = ((f32)demoFrame - 390.0f) / 100.0f; diff --git a/src/d/actor/d_a_shop_item.cpp b/src/d/actor/d_a_shop_item.cpp index b19cfbbe3..195e642d2 100644 --- a/src/d/actor/d_a_shop_item.cpp +++ b/src/d/actor/d_a_shop_item.cpp @@ -13,6 +13,7 @@ #include "d/actor/d_a_item.h" #include "m_Do/m_Do_mtx.h" #include "m_Do/m_Do_lib.h" +#include "d/res/res_cloth.h" enum FDAI_RES_FILE_ID { // IDs and indexes are synced /* BCK */ diff --git a/src/d/actor/d_a_swhit0.cpp b/src/d/actor/d_a_swhit0.cpp index fc20d9567..2b84f1a6e 100644 --- a/src/d/actor/d_a_swhit0.cpp +++ b/src/d/actor/d_a_swhit0.cpp @@ -102,7 +102,7 @@ s32 daSwhit0_c::getSwNo2() { /* 000000C4-00000230 .text CreateHeap__10daSwhit0_cFv */ BOOL daSwhit0_c::CreateHeap() { - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Always", 0x35); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Always", ALWAYS_BDL_OBM_SYOUGEKISW); JUT_ASSERT(0xD5, modelData != 0); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000202); @@ -110,12 +110,12 @@ BOOL daSwhit0_c::CreateHeap() { return FALSE; } - J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes("Always", 0x0D); + J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes("Always", ALWAYS_BCK_OBM_SYOUGEKISW); if (mAnm.init(modelData, anm, true, 0x02, 1.0f, 0, -1, false) == 0) { return FALSE; } - J3DAnmTextureSRTKey* texAnm = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Always", 0x58); + J3DAnmTextureSRTKey* texAnm = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Always", ALWAYS_BTK_OBM_SYOUGEKISW); if (mTexAnm.init(modelData, texAnm, true, 0x02, 1.0f, 0, -1, false, 0) == 0) { return FALSE; } diff --git a/src/d/d_event.cpp b/src/d/d_event.cpp index 855ec248c..08e8debaa 100644 --- a/src/d/d_event.cpp +++ b/src/d/d_event.cpp @@ -550,7 +550,7 @@ BOOL dEvt_control_c::check() { } if (!runCheck() && checkStart()) - g_dComIfG_gameInfo.play.getVibration().StopQuake(-1); + dComIfGp_getVibration().StopQuake(-1); soundProc(); mOrderCount = 0; diff --git a/src/d/d_gameover.cpp b/src/d/d_gameover.cpp index ca161121a..c5528d132 100644 --- a/src/d/d_gameover.cpp +++ b/src/d/d_gameover.cpp @@ -143,7 +143,7 @@ void dDlst_Gameover_CAPTURE_c::draw() { /* 8018E4B4-8018E77C .text _create__11dGameover_cFv */ s32 dGameover_c::_create() { s32 rt = dComIfG_resLoad(&mPhs, "Gover"); - if (dMenu_flag() || (dComIfGp_getHeapLockFlag() != 0 && dComIfGp_getHeapLockFlag() != 4) || g_dComIfG_gameInfo.play.field_0x492a != 0) + if (dMenu_flag() || (dComIfGp_isHeapLockFlag() != 0 && dComIfGp_isHeapLockFlag() != 4) || g_dComIfG_gameInfo.play.field_0x492a != 0) return cPhs_INIT_e; if (rt == cPhs_COMPLEATE_e) { diff --git a/src/d/d_item_data.cpp b/src/d/d_item_data.cpp index 505818950..8bf5702db 100644 --- a/src/d/d_item_data.cpp +++ b/src/d/d_item_data.cpp @@ -6,7 +6,8 @@ #include "d/d_item_data.h" #include "d/d_particle_name.h" #include "JSystem/JUtility/JUTAssert.h" -#include "dolphin/types.h" +#include "d/res/res_always.h" +#include "d/res/res_link.h" // Needed for the .data section to match. static f32 dummy1[3] = {1.0f, 1.0f, 1.0f}; @@ -488,7 +489,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x00: HEART /* mArcname */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_00], - /* mBmdIdx */ 0x002A, + /* mBmdIdx */ ALWAYS_BDL_VHRTL, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -632,7 +633,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x09: S_MAGIC /* mArcname */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_00], - /* mBmdIdx */ 0x0032, + /* mBmdIdx */ ALWAYS_BDL_MPODA, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -648,7 +649,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x0A: L_MAGIC /* mArcname */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_00], - /* mBmdIdx */ 0x0033, + /* mBmdIdx */ ALWAYS_BDL_MPODB, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -744,7 +745,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x10: ARROW_10 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOW_01], - /* mBmdIdx */ 0x001E, + /* mBmdIdx */ ALWAYS_BDL_ARROWITEM, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -760,7 +761,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x11: ARROW_20 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOW_01], - /* mBmdIdx */ 0x001E, + /* mBmdIdx */ ALWAYS_BDL_ARROWITEM, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -776,7 +777,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x12: ARROW_30 /* mArcname */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOW_01], - /* mBmdIdx */ 0x001E, + /* mBmdIdx */ ALWAYS_BDL_ARROWITEM, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -968,7 +969,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { // 0x1E: TRIPLE_HEART /* mArcname */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_00], - /* mBmdIdx */ 0x002A, + /* mBmdIdx */ ALWAYS_BDL_VHRTL, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4587,7 +4588,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x00: HEART /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ 0x002A, + /* mBmdIdx */ ALWAYS_BDL_VHRTL, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4600,10 +4601,10 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x01: GREEN_RUPEE /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ 0x003A, - /* mSrtIdx */ 0x005D, + /* mBmdIdx */ ALWAYS_BDL_VLUPL, + /* mSrtIdx */ ALWAYS_BTK_VLUPL, /* mSrtIdx2 */ -1, - /* mTevIdx */ 0x0051, + /* mTevIdx */ ALWAYS_BRK_VLUPL, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x00, @@ -4613,10 +4614,10 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x02: BLUE_RUPEE /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ 0x003A, - /* mSrtIdx */ 0x005D, + /* mBmdIdx */ ALWAYS_BDL_VLUPL, + /* mSrtIdx */ ALWAYS_BTK_VLUPL, /* mSrtIdx2 */ -1, - /* mTevIdx */ 0x0051, + /* mTevIdx */ ALWAYS_BRK_VLUPL, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x01, @@ -4626,10 +4627,10 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x03: YELLOW_RUPEE /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ 0x003A, - /* mSrtIdx */ 0x005D, + /* mBmdIdx */ ALWAYS_BDL_VLUPL, + /* mSrtIdx */ ALWAYS_BTK_VLUPL, /* mSrtIdx2 */ -1, - /* mTevIdx */ 0x0051, + /* mTevIdx */ ALWAYS_BRK_VLUPL, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x02, @@ -4639,10 +4640,10 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x04: RED_RUPEE /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ 0x003A, - /* mSrtIdx */ 0x005D, + /* mBmdIdx */ ALWAYS_BDL_VLUPL, + /* mSrtIdx */ ALWAYS_BTK_VLUPL, /* mSrtIdx2 */ -1, - /* mTevIdx */ 0x0051, + /* mTevIdx */ ALWAYS_BRK_VLUPL, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x03, @@ -4652,10 +4653,10 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x05: PURPLE_RUPEE /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ 0x003A, - /* mSrtIdx */ 0x005D, + /* mBmdIdx */ ALWAYS_BDL_VLUPL, + /* mSrtIdx */ ALWAYS_BTK_VLUPL, /* mSrtIdx2 */ -1, - /* mTevIdx */ 0x0051, + /* mTevIdx */ ALWAYS_BRK_VLUPL, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x04, @@ -4665,10 +4666,10 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x06: ORANGE_RUPEE /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ 0x003A, - /* mSrtIdx */ 0x005D, + /* mBmdIdx */ ALWAYS_BDL_VLUPL, + /* mSrtIdx */ ALWAYS_BTK_VLUPL, /* mSrtIdx2 */ -1, - /* mTevIdx */ 0x0051, + /* mTevIdx */ ALWAYS_BRK_VLUPL, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x05, @@ -4678,8 +4679,8 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x07: KAKERA_HEART /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ 0x0038, - /* mSrtIdx */ 0x005B, + /* mBmdIdx */ ALWAYS_BDL_VHKAL, + /* mSrtIdx */ ALWAYS_BTK_VHKAL, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -4691,8 +4692,8 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x08: UTUWA_HEART /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ 0x0039, - /* mSrtIdx */ 0x005C, + /* mBmdIdx */ ALWAYS_BDL_VHUTL, + /* mSrtIdx */ ALWAYS_BTK_VHUTL, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, @@ -4704,7 +4705,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x09: S_MAGIC /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ 0x0032, + /* mBmdIdx */ ALWAYS_BDL_MPODA, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4717,7 +4718,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x0A: L_MAGIC /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ 0x0033, + /* mBmdIdx */ ALWAYS_BDL_MPODB, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4730,7 +4731,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x0B: BOMB_5 /* mArc */ item_arcname_tbl[ARCNAME_IDX_LINK], - /* mBmdIdx */ 0x003C, + /* mBmdIdx */ LINK_BDL_BOMB, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4743,7 +4744,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x0C: BOMB_10 /* mArc */ item_arcname_tbl[ARCNAME_IDX_LINK], - /* mBmdIdx */ 0x003C, + /* mBmdIdx */ LINK_BDL_BOMB, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4756,7 +4757,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x0D: BOMB_20 /* mArc */ item_arcname_tbl[ARCNAME_IDX_LINK], - /* mBmdIdx */ 0x003C, + /* mBmdIdx */ LINK_BDL_BOMB, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4769,7 +4770,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x0E: BOMB_30 /* mArc */ item_arcname_tbl[ARCNAME_IDX_LINK], - /* mBmdIdx */ 0x003C, + /* mBmdIdx */ LINK_BDL_BOMB, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4782,10 +4783,10 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x0F: SILVER_RUPEE /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ 0x003A, - /* mSrtIdx */ 0x005D, + /* mBmdIdx */ ALWAYS_BDL_VLUPL, + /* mSrtIdx */ ALWAYS_BTK_VLUPL, /* mSrtIdx2 */ -1, - /* mTevIdx */ 0x0051, + /* mTevIdx */ ALWAYS_BRK_VLUPL, /* mTevIdx2 */ -1, /* mBckIdx */ -1, /* mTevFrm */ 0x06, @@ -4795,7 +4796,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x10: ARROW_10 /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ 0x001E, + /* mBmdIdx */ ALWAYS_BDL_ARROWITEM, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4808,7 +4809,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x11: ARROW_20 /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ 0x001E, + /* mBmdIdx */ ALWAYS_BDL_ARROWITEM, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4821,7 +4822,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x12: ARROW_30 /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ 0x001E, + /* mBmdIdx */ ALWAYS_BDL_ARROWITEM, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4860,7 +4861,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x15: SMALL_KEY /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ 0x002B, + /* mBmdIdx */ ALWAYS_BDL_VKEYL, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4873,12 +4874,12 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x16: RECOVER_FAIRY /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ 0x001F, + /* mBmdIdx */ ALWAYS_BDL_FA, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, - /* mBckIdx */ 0x000C, + /* mBckIdx */ ALWAYS_BCK_FA, /* mTevFrm */ -1, /* mUnknown */ 0x11000022, /* mHeapSize */ 0x4000 @@ -4977,7 +4978,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x1E: TRIPLE_HEART /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ 0x002A, + /* mBmdIdx */ ALWAYS_BDL_VHRTL, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -4990,12 +4991,12 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x1F: PENDANT /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ 0x0029, + /* mBmdIdx */ ALWAYS_BDL_VHAPL, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, - /* mBckIdx */ 0x0015, + /* mBckIdx */ ALWAYS_BCK_VHAPL, /* mTevFrm */ -1, /* mUnknown */ 0x11000022, /* mHeapSize */ 0x0FE0 @@ -5276,7 +5277,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x35: MAGIC_ARROW /* mArc */ item_arcname_tbl[ARCNAME_IDX_LINK], - /* mBmdIdx */ 0x0037, + /* mBmdIdx */ LINK_BDL_ARROW, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -5289,7 +5290,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x36: LIGHT_ARROW /* mArc */ item_arcname_tbl[ARCNAME_IDX_LINK], - /* mBmdIdx */ 0x0037, + /* mBmdIdx */ LINK_BDL_ARROW, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, @@ -5484,12 +5485,12 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x45: SKULL_NECKLACE /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ 0x0027, + /* mBmdIdx */ ALWAYS_BDL_VDOKL, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, - /* mBckIdx */ 0x0012, + /* mBckIdx */ ALWAYS_BCK_VDOKL, /* mTevFrm */ -1, /* mUnknown */ 0x11000022, /* mHeapSize */ 0x08A0 @@ -5497,12 +5498,12 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x46: BOKOBABA_SEED /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ 0x0026, + /* mBmdIdx */ ALWAYS_BDL_VBOKL, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, - /* mBckIdx */ 0x0010, + /* mBckIdx */ ALWAYS_BCK_VBOKL, /* mTevFrm */ -1, /* mUnknown */ 0x11000022, /* mHeapSize */ 0x0720 @@ -5510,12 +5511,12 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x47: GOLDEN_FEATHER /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ 0x0037, - /* mSrtIdx */ 0x005A, + /* mBmdIdx */ ALWAYS_BDL_VHANL, + /* mSrtIdx */ ALWAYS_BTK_VHANL, /* mSrtIdx2 */ -1, - /* mTevIdx */ 0x0050, + /* mTevIdx */ ALWAYS_BRK_VHANL, /* mTevIdx2 */ -1, - /* mBckIdx */ 0x0014, + /* mBckIdx */ ALWAYS_BCK_VHANL, /* mTevFrm */ -1, /* mUnknown */ 0x11000222, /* mHeapSize */ 0x0EC0 @@ -5523,12 +5524,12 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x48: BOKO_BELT /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ 0x0025, - /* mSrtIdx */ 0x0059, + /* mBmdIdx */ ALWAYS_BDL_VBELL, + /* mSrtIdx */ ALWAYS_BTK_VBELL, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, - /* mBckIdx */ 0x000F, + /* mBckIdx */ ALWAYS_BCK_VBELL, /* mTevFrm */ -1, /* mUnknown */ 0x11000222, /* mHeapSize */ 0x0760 @@ -5536,12 +5537,12 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x49: RED_JELLY /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ 0x0036, + /* mBmdIdx */ ALWAYS_BDL_VCHUL, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, - /* mTevIdx */ 0x004F, + /* mTevIdx */ ALWAYS_BRK_VCHUL, /* mTevIdx2 */ -1, - /* mBckIdx */ 0x0011, + /* mBckIdx */ ALWAYS_BCK_VCHUL, /* mTevFrm */ 0x01, /* mUnknown */ 0x11000022, /* mHeapSize */ 0x0800 @@ -5549,12 +5550,12 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x4A: GREEN_JELLY /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ 0x0036, + /* mBmdIdx */ ALWAYS_BDL_VCHUL, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, - /* mTevIdx */ 0x004F, + /* mTevIdx */ ALWAYS_BRK_VCHUL, /* mTevIdx2 */ -1, - /* mBckIdx */ 0x0011, + /* mBckIdx */ ALWAYS_BCK_VCHUL, /* mTevFrm */ 0x00, /* mUnknown */ 0x11000022, /* mHeapSize */ 0x0800 @@ -5562,12 +5563,12 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x4B: BLUE_JELLY /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ 0x0036, + /* mBmdIdx */ ALWAYS_BDL_VCHUL, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, - /* mTevIdx */ 0x004F, + /* mTevIdx */ ALWAYS_BRK_VCHUL, /* mTevIdx2 */ -1, - /* mBckIdx */ 0x0011, + /* mBckIdx */ ALWAYS_BCK_VCHUL, /* mTevFrm */ 0x02, /* mUnknown */ 0x11000022, /* mHeapSize */ 0x0800 @@ -6277,12 +6278,12 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { // 0x82: BIRD_ESA_5 /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], - /* mBmdIdx */ 0x0028, + /* mBmdIdx */ ALWAYS_BDL_VESAL, /* mSrtIdx */ -1, /* mSrtIdx2 */ -1, /* mTevIdx */ -1, /* mTevIdx2 */ -1, - /* mBckIdx */ 0x0013, + /* mBckIdx */ ALWAYS_BCK_VESAL, /* mTevFrm */ -1, /* mUnknown */ 0x11000022, /* mHeapSize */ 0x0740 diff --git a/src/d/d_kankyo_rain.cpp b/src/d/d_kankyo_rain.cpp index 02a23171f..9144ce9ef 100644 --- a/src/d/d_kankyo_rain.cpp +++ b/src/d/d_kankyo_rain.cpp @@ -712,8 +712,7 @@ void dKyr_rain_init() { /* 8008D0B4-8008D0DC .text rain_bg_chk__FP19dKankyo_rain_Packeti */ void rain_bg_chk(dKankyo_rain_Packet* pPkt, int idx) { - camera_class* pCamera = g_dComIfG_gameInfo.play.mCameraInfo[0].mpCamera; - pPkt->mEff[idx].field_0x30 = pCamera->mLookat.mCenter.y + -800.0f; + pPkt->mEff[idx].field_0x30 = dComIfGp_getCamera(0)->mLookat.mCenter.y + -800.0f; } /* 8008D0DC-8008D53C .text overhead_bg_chk__Fv */ diff --git a/src/d/d_particle.cpp b/src/d/d_particle.cpp index 6db702445..dff2dcc3d 100644 --- a/src/d/d_particle.cpp +++ b/src/d/d_particle.cpp @@ -444,7 +444,7 @@ void dPa_control_c::createCommon(const void* param_1) { mEmitterMng = new(mHeap, 0) JPAEmitterManager(mCommonResMng, 3000, 150, 200, mHeap); JUT_ASSERT(1324, mEmitterMng != 0); JKRHeap* oldHeap = mDoExt_setCurrentHeap(mHeap); - mModelControl = new dPa_modelControl_c((J3DModelData*)g_dComIfG_gameInfo.mResControl.getObjectRes("Always", 0x31)); + mModelControl = new dPa_modelControl_c((J3DModelData*)dComIfG_getObjectRes("Always", ALWAYS_BDL_MPODA)); JUT_ASSERT(1332, mModelControl != 0); for (u16 i = 0; i < 8; i++) { u16 var1 = dPa_name::j_o_id[i]; diff --git a/src/d/d_place_name.cpp b/src/d/d_place_name.cpp index 74fdff0d9..26cd2d454 100644 --- a/src/d/d_place_name.cpp +++ b/src/d/d_place_name.cpp @@ -135,7 +135,7 @@ void dPlace_name_c::draw() { s32 dPn_c::_create() { s32 rt = dComIfG_resLoad(&mPhs, "PName"); - if (dMenu_flag() || (g_dComIfG_gameInfo.play.getHeapLockFlag() != 0 && g_dComIfG_gameInfo.play.getHeapLockFlag() != 10) || g_dComIfG_gameInfo.play.field_0x492a != 0) + if (dMenu_flag() || (dComIfGp_isHeapLockFlag() != 0 && dComIfGp_isHeapLockFlag() != 10) || g_dComIfG_gameInfo.play.field_0x492a != 0) return cPhs_INIT_e; if (mState == 0) { @@ -143,8 +143,8 @@ s32 dPn_c::_create() { dRes_info_c * resInfo = dComIfG_getObjectResInfo("PName"); JUT_ASSERT(VERSION_SELECT(147, 169, 169), resInfo != 0); - mpHeap = g_dComIfG_gameInfo.play.getExpHeap2D(); - g_dComIfG_gameInfo.play.setHeapLockFlag(10); + mpHeap = dComIfGp_getExpHeap2D(); + dComIfGp_setHeapLockFlag(10); JKRHeap * oldHeap = mDoExt_setCurrentHeap(mpHeap); dPn_scrn = new dPlace_name_c(); JUT_ASSERT(VERSION_SELECT(155, 177, 177), dPn_scrn != 0); @@ -202,9 +202,9 @@ s32 dPn_c::_create() { /* 801614E8-80161554 .text _execute__5dPn_cFv */ BOOL dPn_c::_execute() { - if (g_dComIfG_gameInfo.play.mPlacenameState == 2) { + if (dComIfGp_checkStageName() == 2) { dPn_scrn->_openAnime(); - } else if (g_dComIfG_gameInfo.play.mPlacenameState == 1) { + } else if (dComIfGp_checkStageName() == 1) { if (dPn_scrn->_closeAnime()) fopMsgM_Delete(this); } @@ -228,7 +228,7 @@ BOOL dPn_c::_delete() { delete dvd; mpHeap->free(mpTIMG); mpHeap->freeAll(); - g_dComIfG_gameInfo.play.offHeapLockFlag(); + dComIfGp_offHeapLockFlag(); mDoExt_setCurrentHeap(oldHeap); dComIfG_resDelete(&mPhs, "PName"); return TRUE; diff --git a/src/d/d_save.cpp b/src/d/d_save.cpp index c4c07b8bd..c11ea4e24 100644 --- a/src/d/d_save.cpp +++ b/src/d/d_save.cpp @@ -1792,16 +1792,16 @@ int dSv_info_c::card_to_memory(char* i_cardPtr, int i_dataNum) { buffer += sizeof(dSv_player_status_c_c); } - memcpy(g_dComIfG_gameInfo.save.getPSave(), buffer, sizeof(dSv_memory_c) * dSv_save_c::STAGE_MAX); + memcpy(dComIfGs_getPCourseInfo(), buffer, sizeof(dSv_memory_c) * dSv_save_c::STAGE_MAX); buffer += sizeof(dSv_memory_c) * dSv_save_c::STAGE_MAX; - memcpy(g_dComIfG_gameInfo.save.getPOcean(), buffer, sizeof(dSv_ocean_c)); + memcpy(dComIfGs_getPOcean(), buffer, sizeof(dSv_ocean_c)); buffer += sizeof(dSv_ocean_c); - memcpy(g_dComIfG_gameInfo.save.getPEvent(), buffer, sizeof(dSv_event_c)); + memcpy(dComIfGs_getPEvent(), buffer, sizeof(dSv_event_c)); buffer += sizeof(dSv_event_c); - memcpy(g_dComIfG_gameInfo.save.getPReserve(), buffer, sizeof(dSv_reserve_c)); + memcpy(dComIfGs_getPReserve(), buffer, sizeof(dSv_reserve_c)); buffer += sizeof(dSv_reserve_c); s32 load_size = buffer - buffer_start; diff --git a/src/d/d_shop.cpp b/src/d/d_shop.cpp index 017511af8..94a5dccea 100644 --- a/src/d/d_shop.cpp +++ b/src/d/d_shop.cpp @@ -1344,7 +1344,7 @@ u8 dShop_BoughtErrorStatus(ShopItems_c* shopItems, int param_2, int param_3) { if (buyCond & Shop_BuyCond_MUST_OWN_ITEM_e) { if (itemData->mMustOwnItemNo == BOW) { - if (g_dComIfG_gameInfo.save.getPlayer().getItem().getItem(0xC) == 0xFF) { + if (dComIfGs_getItem(0xC) == 0xFF) { errorStatus |= Shop_BuyCond_MUST_OWN_ITEM_e; } } else { diff --git a/src/f_op/f_op_msg_mng.cpp b/src/f_op/f_op_msg_mng.cpp index 00f538d6b..80d7317cd 100644 --- a/src/f_op/f_op_msg_mng.cpp +++ b/src/f_op/f_op_msg_mng.cpp @@ -61,7 +61,7 @@ void fopMsgM_hyrule_language_check(u32) { /* 8002AE28-8002AED4 .text fopMsgM_setStageLayer__FPv */ s32 fopMsgM_setStageLayer(void* proc) { - scene_class* stageProc = fopScnM_SearchByID(g_dComIfG_gameInfo.play.getRoomControl()->mProcID); + scene_class* stageProc = fopScnM_SearchByID(dStage_roomControl_c::getProcID()); JUT_ASSERT(0x189, stageProc != 0); u32 layer = fpcM_LayerID(stageProc); return fpcM_ChangeLayerID(proc, layer);