Merge pull request #306 from MokhaLeee/banim20230403

banim: renamed functions and variables
This commit is contained in:
Revo 2023-04-03 01:37:28 -04:00 committed by GitHub
commit ca94c8eed3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 366 additions and 349 deletions

File diff suppressed because it is too large Load Diff

View File

@ -86,10 +86,10 @@ gUnknown_085B92C4: @ 0x085B92C4
.global gUnknown_085B9354
gUnknown_085B9354: @ 0x085B9354
.incbin "baserom.gba", 0x5B9354, 0x4
.word 0
.global gUnknown_085B9358
gUnknown_085B9358: @ 0x085B9358
.global gProc_ekrBattleDeamon
gProc_ekrBattleDeamon: @ 0x085B9358
@ PROC_NAME
.short 0x1, 0x0
.word 0x80da3a4
@ -104,8 +104,8 @@ gUnknown_085B9358: @ 0x085B9358
.word 0x0
.global gUnknown_085B9378
gUnknown_085B9378: @ 0x085B9378
.global gProc_ekrBattle
gProc_ekrBattle: @ 0x085B9378
@ PROC_NAME
.short 0x1, 0x0
.word 0x80da3b4
@ -123,8 +123,8 @@ gUnknown_085B9378: @ 0x085B9378
.word 0x0
.global gUnknown_085B93A0
gUnknown_085B93A0: @ 0x085B93A0
.global gProc_ekrLvupFan
gProc_ekrLvupFan: @ 0x085B93A0
@ PROC_NAME
.short 0x1, 0x0
.word 0x80da3c0
@ -136,8 +136,8 @@ gUnknown_085B93A0: @ 0x085B93A0
.word 0x0
.global gUnknown_085B93B8
gUnknown_085B93B8: @ 0x085B93B8
.global gProc_ekrGauge
gProc_ekrGauge: @ 0x085B93B8
@ PROC_NAME
.short 0x1, 0x0
.word 0x80da3cc
@ -197,8 +197,8 @@ gUnknown_085B95BC: @ 0x085B95BC
gUnknown_085B95D4: @ 0x085B95D4
.incbin "baserom.gba", 0x5B95D4, 0x18
.global gUnknown_085B95EC
gUnknown_085B95EC: @ 0x085B95EC
.global gProc_ekrDispUP
gProc_ekrDispUP: @ 0x085B95EC
@ PROC_NAME
.short 0x1, 0x0
.word 0x80da3d8
@ -210,8 +210,8 @@ gUnknown_085B95EC: @ 0x085B95EC
.word 0x0
.global gUnknown_085B9604
gUnknown_085B9604: @ 0x085B9604
.global gProc_efxHPBar
gProc_efxHPBar: @ 0x085B9604
@ PROC_NAME
.short 0x1, 0x0
.word 0x80da3e4
@ -229,8 +229,8 @@ gUnknown_085B9604: @ 0x085B9604
.word 0x0
.global gUnknown_085B962C
gUnknown_085B962C: @ 0x085B962C
.global gProc_efxHPBarResire
gProc_efxHPBarResire: @ 0x085B962C
@ PROC_NAME
.short 0x1, 0x0
.word 0x80da3f0
@ -254,8 +254,8 @@ gUnknown_085B962C: @ 0x085B962C
.word 0x0
.global gUnknown_085B9664
gUnknown_085B9664: @ 0x085B9664
.global gProc_efxAvoid
gProc_efxAvoid: @ 0x085B9664
@ PROC_NAME
.short 0x1, 0x0
.word 0x80da400
@ -273,8 +273,8 @@ gUnknown_085B9664: @ 0x085B9664
.word 0x0
.global gUnknown_085B968C
gUnknown_085B968C: @ 0x085B968C
.global gProc_efxHPBarLive
gProc_efxHPBarLive: @ 0x085B968C
@ PROC_NAME
.short 0x1, 0x0
.word 0x80da40c
@ -292,8 +292,8 @@ gUnknown_085B968C: @ 0x085B968C
.word 0x0
.global gUnknown_085B96B4
gUnknown_085B96B4: @ 0x085B96B4
.global gProc_efxNoDamage
gProc_efxNoDamage: @ 0x085B96B4
@ PROC_NAME
.short 0x1, 0x0
.word 0x80da41c
@ -311,8 +311,8 @@ gUnknown_085B96B4: @ 0x085B96B4
.word 0x0
.global gUnknown_085B96DC
gUnknown_085B96DC: @ 0x085B96DC
.global gProc_efxNoDamageYure
gProc_efxNoDamageYure: @ 0x085B96DC
@ PROC_NAME
.short 0x1, 0x0
.word 0x80da428
@ -324,8 +324,8 @@ gUnknown_085B96DC: @ 0x085B96DC
.word 0x0
.global gUnknown_085B96F4
gUnknown_085B96F4: @ 0x085B96F4
.global gProc_efxStatusCHG
gProc_efxStatusCHG: @ 0x085B96F4
@ PROC_NAME
.short 0x1, 0x0
.word 0x80da454
@ -346,8 +346,8 @@ gUnknown_085B96F4: @ 0x085B96F4
.word 0x0
.global gUnknown_085B9724
gUnknown_085B9724: @ 0x085B9724
.global gProc_efxDeadEvent
gProc_efxDeadEvent: @ 0x085B9724
@ PROC_NAME
.short 0x1, 0x0
.word 0x80da464
@ -371,8 +371,8 @@ gUnknown_085B9724: @ 0x085B9724
.word 0x0
.global gUnknown_085B975C
gUnknown_085B975C: @ 0x085B975C
.global gProc_efxDead
gProc_efxDead: @ 0x085B975C
@ PROC_NAME
.short 0x1, 0x0
.word 0x80da474
@ -387,8 +387,8 @@ gUnknown_085B975C: @ 0x085B975C
.word 0x0
.global gUnknown_085B977C
gUnknown_085B977C: @ 0x085B977C
.global gProc_efxDeadPika
gProc_efxDeadPika: @ 0x085B977C
@ PROC_NAME
.short 0x1, 0x0
.word 0x80da47c
@ -400,8 +400,8 @@ gUnknown_085B977C: @ 0x085B977C
.word 0x0
.global gUnknown_085B9794
gUnknown_085B9794: @ 0x085B9794
.global gProc_efxDeadAlpha
gProc_efxDeadAlpha: @ 0x085B9794
@ PROC_NAME
.short 0x1, 0x0
.word 0x80da488
@ -413,8 +413,8 @@ gUnknown_085B9794: @ 0x085B9794
.word 0x0
.global gUnknown_085B97AC
gUnknown_085B97AC: @ 0x085B97AC
.global gProc_efxDeadDragonAlpha
gProc_efxDeadDragonAlpha: @ 0x085B97AC
@ PROC_NAME
.short 0x1, 0x0
.word 0x80da498
@ -426,8 +426,8 @@ gUnknown_085B97AC: @ 0x085B97AC
.word 0x0
.global gUnknown_085B97C4
gUnknown_085B97C4: @ 0x085B97C4
.global gProc_efxFarAttack
gProc_efxFarAttack: @ 0x085B97C4
@ PROC_NAME
.short 0x1, 0x0
.word 0x80da4ac
@ -445,8 +445,8 @@ gUnknown_085B97C4: @ 0x085B97C4
.word 0x0
.global gUnknown_085B97EC
gUnknown_085B97EC: @ 0x085B97EC
.global gProc_efxQuakePure
gProc_efxQuakePure: @ 0x085B97EC
@ PROC_NAME
.short 0x1, 0x0
.word 0x80dabc0
@ -493,8 +493,8 @@ gUnknown_085B9804: @ 0x085B9804
.4byte gUnknown_080DA66E + 0x208
.4byte 0
.global gUnknown_085B9884
gUnknown_085B9884: @ 0x085B9884
.global gProc_efxHitQuakePure
gProc_efxHitQuakePure: @ 0x085B9884
@ PROC_NAME
.short 0x1, 0x0
.word 0x80dabd0
@ -506,8 +506,8 @@ gUnknown_085B9884: @ 0x085B9884
.word 0x0
.global gUnknown_085B989C
gUnknown_085B989C: @ 0x085B989C
.global gProc_efxQuake
gProc_efxQuake: @ 0x085B989C
@ PROC_NAME
.short 0x1, 0x0
.word 0x80dabe0
@ -519,8 +519,8 @@ gUnknown_085B989C: @ 0x085B989C
.word 0x0
.global gUnknown_085B98B4
gUnknown_085B98B4: @ 0x085B98B4
.global gProc_efxHitQuake
gProc_efxHitQuake: @ 0x085B98B4
@ PROC_NAME
.short 0x1, 0x0
.word 0x80dabec
@ -532,8 +532,8 @@ gUnknown_085B98B4: @ 0x085B98B4
.word 0x0
.global gUnknown_085B98CC
gUnknown_085B98CC: @ 0x085B98CC
.global gProc_efxFlashBG
gProc_efxFlashBG: @ 0x085B98CC
@ PROC_NAME
.short 0x1, 0x0
.word 0x80dabf8
@ -551,8 +551,8 @@ gUnknown_085B98CC: @ 0x085B98CC
.word 0x0
.global gUnknown_085B98F4
gUnknown_085B98F4: @ 0x085B98F4
.global gProc_efxWhiteOUT
gProc_efxWhiteOUT: @ 0x085B98F4
@ PROC_NAME
.short 0x1, 0x0
.word 0x80dac04
@ -570,8 +570,8 @@ gUnknown_085B98F4: @ 0x085B98F4
.word 0x0
.global gUnknown_085B991C
gUnknown_085B991C: @ 0x085B991C
.global gProc_efxWhiteIN
gProc_efxWhiteIN: @ 0x085B991C
@ PROC_NAME
.short 0x1, 0x0
.word 0x80dac10
@ -589,8 +589,8 @@ gUnknown_085B991C: @ 0x085B991C
.word 0x0
.global gUnknown_085B9944
gUnknown_085B9944: @ 0x085B9944
.global gProc_efxBlackOUT
gProc_efxBlackOUT: @ 0x085B9944
@ PROC_NAME
.short 0x1, 0x0
.word 0x80dac1c
@ -608,8 +608,8 @@ gUnknown_085B9944: @ 0x085B9944
.word 0x0
.global gUnknown_085B996C
gUnknown_085B996C: @ 0x085B996C
.global gProc_efxBlackIN
gProc_efxBlackIN: @ 0x085B996C
@ PROC_NAME
.short 0x1, 0x0
.word 0x80dac28
@ -627,8 +627,8 @@ gUnknown_085B996C: @ 0x085B996C
.word 0x0
.global gUnknown_085B9994
gUnknown_085B9994: @ 0x085B9994
.global gProc_efxFlashHPBar
gProc_efxFlashHPBar: @ 0x085B9994
@ PROC_NAME
.short 0x1, 0x0
.word 0x80dac34
@ -649,8 +649,8 @@ gUnknown_085B9994: @ 0x085B9994
.word 0x0
.global gUnknown_085B99C4
gUnknown_085B99C4: @ 0x085B99C4
.global gProc_efxHPBarColorChange
gProc_efxHPBarColorChange: @ 0x085B99C4
@ PROC_NAME
.short 0x1, 0x0
.word 0x80dac44
@ -665,8 +665,8 @@ gUnknown_085B99C4: @ 0x085B99C4
.word 0x0
.global gUnknown_085B99E4
gUnknown_085B99E4: @ 0x085B99E4
.global gProc_efxFlashUnit
gProc_efxFlashUnit: @ 0x085B99E4
@ PROC_NAME
.short 0x1, 0x0
.word 0x80daca4
@ -684,8 +684,8 @@ gUnknown_085B99E4: @ 0x085B99E4
.word 0x0
.global gUnknown_085B9A0C
gUnknown_085B9A0C: @ 0x085B9A0C
.global gProc_efxFlashUnitEffect
gProc_efxFlashUnitEffect: @ 0x085B9A0C
@ PROC_NAME
.short 0x1, 0x0
.word 0x80dacb4
@ -703,8 +703,8 @@ gUnknown_085B9A0C: @ 0x085B9A0C
.word 0x0
.global gUnknown_085B9A34
gUnknown_085B9A34: @ 0x085B9A34
.global gProc_efxStatusUnit
gProc_efxStatusUnit: @ 0x085B9A34
@ PROC_NAME
.short 0x1, 0x0
.word 0x80daccc
@ -722,8 +722,8 @@ gUnknown_085B9A34: @ 0x085B9A34
.word 0x0
.global gUnknown_085B9A5C
gUnknown_085B9A5C: @ 0x085B9A5C
.global gProc_efxWeaponIcon
gProc_efxWeaponIcon: @ 0x085B9A5C
@ PROC_NAME
.short 0x1, 0x0
.word 0x80dacfc
@ -741,8 +741,8 @@ gUnknown_085B9A5C: @ 0x085B9A5C
.word 0x0
.global gUnknown_085B9A84
gUnknown_085B9A84: @ 0x085B9A84
.global gProc_efxSpellCast
gProc_efxSpellCast: @ 0x085B9A84
@ PROC_NAME
.short 0x1, 0x0
.word 0x80dad38
@ -763,8 +763,8 @@ gUnknown_085B9A84: @ 0x085B9A84
.word 0x0
.global gUnknown_085B9AB4
gUnknown_085B9AB4: @ 0x085B9AB4
.global gProc_efxspdquake
gProc_efxspdquake: @ 0x085B9AB4
@ PROC_NAME
.short 0x1, 0x0
.word 0x80dad48
@ -779,8 +779,8 @@ gUnknown_085B9AB4: @ 0x085B9AB4
.word 0x0
.global gUnknown_085B9AD4
gUnknown_085B9AD4: @ 0x085B9AD4
.global gProc_ekrBattleStarting
gProc_ekrBattleStarting: @ 0x085B9AD4
@ PROC_NAME
.short 0x1, 0x0
.word 0x80dad54
@ -810,8 +810,8 @@ gUnknown_085B9AD4: @ 0x085B9AD4
.word 0x0
.global gUnknown_085B9B1C
gUnknown_085B9B1C: @ 0x085B9B1C
.global gProc_ekrbattleendin
gProc_ekrbattleendin: @ 0x085B9B1C
@ PROC_NAME
.short 0x1, 0x0
.word 0x80dad68
@ -997,8 +997,8 @@ gUnknown_085B9CE4: @ 0x085B9CE4
.word 0x0
.global gUnknown_085B9D0C
gUnknown_085B9D0C: @ 0x085B9D0C
.global gProc_ekrWindowAppear
gProc_ekrWindowAppear: @ 0x085B9D0C
@ PROC_NAME
.short 0x1, 0x0
.word 0x80dae58
@ -1010,8 +1010,8 @@ gUnknown_085B9D0C: @ 0x085B9D0C
.word 0x0
.global gUnknown_085B9D24
gUnknown_085B9D24: @ 0x085B9D24
.global gProc_ekrNamewinAppear
gProc_ekrNamewinAppear: @ 0x085B9D24
@ PROC_NAME
.short 0x1, 0x0
.word 0x80dae68
@ -1026,8 +1026,8 @@ gUnknown_085B9D24: @ 0x085B9D24
.word 0x0
.global gUnknown_085B9D44
gUnknown_085B9D44: @ 0x085B9D44
.global gProc_ekrBaseAppear
gProc_ekrBaseAppear: @ 0x085B9D44
@ PROC_NAME
.short 0x1, 0x0
.word 0x80dae7c
@ -1056,8 +1056,8 @@ gUnknown_085B9D6C: @ 0x085B9D6C
.4byte gUnknown_085B9E4C + 0xc
.4byte gUnknown_085B9E4C + 0xa4
.global gUnknown_085B9D94
gUnknown_085B9D94: @ 0x085B9D94
.global gProc_ekrChienCHR
gProc_ekrChienCHR: @ 0x085B9D94
@ PROC_NAME
.short 0x1, 0x0
.word 0x80daf34
@ -1069,8 +1069,8 @@ gUnknown_085B9D94: @ 0x085B9D94
.word 0x0
.global gUnknown_085B9DAC
gUnknown_085B9DAC: @ 0x085B9DAC
.global gProc_efxAnimeDrvProc
gProc_efxAnimeDrvProc: @ 0x085B9DAC
@ PROC_NAME
.short 0x1, 0x0
.word 0x80daf40
@ -1081,9 +1081,8 @@ gUnknown_085B9DAC: @ 0x085B9DAC
.short 0x0, 0x0
.word 0x0
.global gUnknown_085B9DC4
gUnknown_085B9DC4: @ 0x085B9DC4
.global ProcScr_ekrUnitMainMini
ProcScr_ekrUnitMainMini: @ 0x085B9DC4
@ PROC_NAME
.short 0x1, 0x0
.word 0x80daf50
@ -1095,8 +1094,8 @@ gUnknown_085B9DC4: @ 0x085B9DC4
.word 0x0
.global gUnknown_085B9DDC
gUnknown_085B9DDC: @ 0x085B9DDC
.global gProc_ekrTogiInit
gProc_ekrTogiInit: @ 0x085B9DDC
@ PROC_NAME
.short 0x1, 0x0
.word 0x80daff8
@ -1117,8 +1116,8 @@ gUnknown_085B9DDC: @ 0x085B9DDC
.word 0x0
.global gUnknown_085B9E0C
gUnknown_085B9E0C: @ 0x085B9E0C
.global gProc_ekrTogiEnd
gProc_ekrTogiEnd: @ 0x085B9E0C
@ PROC_NAME
.short 0x1, 0x0
.word 0x80db008
@ -1136,8 +1135,8 @@ gUnknown_085B9E0C: @ 0x085B9E0C
.word 0x0
.global gUnknown_085B9E34
gUnknown_085B9E34: @ 0x085B9E34
.global gProc_ekrTogiColor
gProc_ekrTogiColor: @ 0x085B9E34
@ PROC_NAME
.short 0x1, 0x0
.word 0x80db018

View File

@ -1,11 +1,18 @@
#ifndef GUARD_ANIME_H
#define GUARD_ANIME_H
#include "global.h"
#include "bmbattle.h"
#include "fontgrp.h"
struct Anim
{
struct Anim {
enum state {
ANIM_BIT_ENABLED = (1 << 0),
ANIM_BIT_HIDDEN = (1 << 1),
ANIM_BIT_2 = (1 << 2),
ANIM_BIT_FROZEN = (1 << 3),
};
/* 00 */ u16 state;
/* 02 */ short xPosition;
/* 04 */ short yPosition;
@ -37,50 +44,49 @@ struct Anim
/* 44 */ const void* pUnk44;
};
struct AnimSpriteData
{
struct AnimRoundData {
enum type_identifier {
ANIM_ROUND_HIT_CLOSE,
ANIM_ROUND_CRIT_CLOSE,
ANIM_ROUND_NONCRIT_FAR,
ANIM_ROUND_CRIT_FAR,
ANIM_ROUND_TAKING_MISS_CLOSE,
ANIM_ROUND_TAKING_MISS_FAR,
ANIM_ROUND_TAKING_HIT_CLOSE,
ANIM_ROUND_STANDING,
ANIM_ROUND_TAKING_HIT_FAR,
ANIM_ROUND_MISS_CLOSE,
};
s16 type_identifier;
u16 flags;
};
struct AnimSpriteData {
/* 00 */ u32 header;
union
{
struct
{
/* 04 */ u16 pa;
/* 06 */ u16 pb;
/* 08 */ u16 pc;
/* 0A */ u16 pd;
} affine;
struct
{
/* 04 */ u16 oam2;
/* 06 */ short x;
/* 08 */ short y;
} object;
union {
struct {
/* 04 */ u16 pa;
/* 06 */ u16 pb;
/* 08 */ u16 pc;
/* 0A */ u16 pd;
} affine;
struct {
/* 04 */ u16 oam2;
/* 06 */ short x;
/* 08 */ short y;
} object;
} as;
};
enum
{
// For use with Anim::state
ANIM_BIT_ENABLED = (1 << 0),
ANIM_BIT_HIDDEN = (1 << 1),
ANIM_BIT_2 = (1 << 2),
ANIM_BIT_FROZEN = (1 << 3),
};
enum
{
enum {
ANIM_MAX_COUNT = 50,
};
enum
{
enum {
// Animation Command Identifiers
// TODO: complete during battle animation decomp
ANIM_CMD_NOP = 0x00,
@ -101,6 +107,20 @@ enum
#define ANIM_IS_DISABLED(anim) ((anim)->state == 0)
enum ganims_entry_index {
GANIM_INDEX_LEFT_FRONT,
GANIM_INDEX_LEFY_BACK,
GANIM_INDEX_RIGHT_FRONT,
GANIM_INDEX_RIGHT_BACK,
GANIM_INDEX_MAX
};
extern struct Anim *gAnims[GANIM_INDEX_MAX];
extern u16 gBattleActorSide;
extern u16 gBattleInitSide;
extern struct AnimRoundData gAnimRoundData;
extern struct BattleUnit *gpEkrBattleUnitLeft;
extern struct BattleUnit *gpEkrBattleUnitRight;
extern struct Font gSomeFontStruct;

View File

@ -7,7 +7,7 @@
#include "proc.h"
// extern ??? gUnknown_02000000
// extern ??? gUnknown_02000010
// extern ??? gAnims
// extern ??? gUnknown_02000018
// extern ??? gUnknown_0200001C
// extern ??? gUnknown_02000020
@ -23,7 +23,7 @@
// extern ??? gUnknown_02000054
// extern ??? gUnknown_0200005C
// extern ??? gUnknown_02000060
// extern ??? gUnknown_02000064
// extern ??? gpProcEkrBattle
// extern ??? gUnknown_02000068
// extern ??? gUnknown_0200006C
// extern ??? gUnknown_02000088
@ -525,23 +525,21 @@ extern struct ActionData gActionData;
// extern ??? gUnknown_0203DDB4
// extern ??? gUnknown_0203DDDC
// extern ??? gUnknown_0203E0F0
// extern ??? gUnknown_0203E0F4
// extern ??? gUnknown_0203E0F8
// extern ??? gBattleDeamonActive
// extern ??? gpProcEkrBattleDeamon
// extern ??? gUnknown_0203E0FC
// extern ??? gUnknown_0203E0FE
// extern ??? gUnknown_0203E100
// extern ??? gUnknown_0203E102
// extern ??? gUnknown_0203E104
// extern ??? gUnknown_0203E108
// extern ??? gUnknown_0203E10C
// extern ??? gUnknown_0203E110
// extern ??? gUnknown_0203E114
// extern ??? gUnknown_0203E118
// extern ??? gUnknown_0203E11A
// extern ??? gUnknown_0203E11C
extern EWRAM_DATA s16 gUnknown_0203E120;
// extern ??? gUnknown_0203E122
// extern ??? gUnknown_0203E12A
// extern ??? gAnimRoundData
// extern ??? gUnknown_0203E152
// extern ??? gUnknown_0203E156
// extern ??? gUnknown_0203E182
@ -1575,10 +1573,10 @@ extern const u8 gUnkUiFrameImage[];
extern const u16 gUnkUiFramePalettes[];
// extern ??? gUnknown_085B92C4
// extern ??? gUnknown_085B9354
// extern ??? gUnknown_085B9358
// extern ??? gUnknown_085B9378
// extern ??? gUnknown_085B93A0
// extern ??? gUnknown_085B93B8
// extern ??? gProc_ekrBattleDeamon
// extern ??? gProc_ekrBattle
// extern ??? gProc_ekrLvupFan
// extern ??? gProc_ekrGauge
// extern ??? gUnknown_085B93D0
// extern ??? gUnknown_085B940C
// extern ??? gUnknown_085B9424
@ -1591,40 +1589,40 @@ extern const u16 gUnkUiFramePalettes[];
// extern ??? gUnknown_085B95A4
// extern ??? gUnknown_085B95BC
// extern ??? gUnknown_085B95D4
// extern ??? gUnknown_085B95EC
// extern ??? gUnknown_085B9604
// extern ??? gUnknown_085B962C
// extern ??? gUnknown_085B9664
// extern ??? gUnknown_085B968C
// extern ??? gUnknown_085B96B4
// extern ??? gUnknown_085B96DC
// extern ??? gUnknown_085B96F4
// extern ??? gUnknown_085B9724
// extern ??? gUnknown_085B975C
// extern ??? gUnknown_085B977C
// extern ??? gUnknown_085B9794
// extern ??? gUnknown_085B97AC
// extern ??? gUnknown_085B97C4
// extern ??? gUnknown_085B97EC
// extern ??? gProc_ekrDispUP
// extern ??? gProc_efxHPBar
// extern ??? gProc_efxHPBarResire
// extern ??? gProc_efxAvoid
// extern ??? gProc_efxHPBarLive
// extern ??? gProc_efxNoDamage
// extern ??? gProc_efxNoDamageYure
// extern ??? gProc_efxStatusCHG
// extern ??? gProc_efxDeadEvent
// extern ??? gProc_efxDead
// extern ??? gProc_efxDeadPika
// extern ??? gProc_efxDeadAlpha
// extern ??? gProc_efxDeadDragonAlpha
// extern ??? gProc_efxFarAttack
// extern ??? gProc_efxQuakePure
// extern ??? gUnknown_085B9804
// extern ??? gUnknown_085B9884
// extern ??? gUnknown_085B989C
// extern ??? gUnknown_085B98B4
// extern ??? gUnknown_085B98CC
// extern ??? gUnknown_085B98F4
// extern ??? gUnknown_085B991C
// extern ??? gUnknown_085B9944
// extern ??? gUnknown_085B996C
// extern ??? gUnknown_085B9994
// extern ??? gUnknown_085B99C4
// extern ??? gUnknown_085B99E4
// extern ??? gUnknown_085B9A0C
// extern ??? gUnknown_085B9A34
// extern ??? gUnknown_085B9A5C
// extern ??? gUnknown_085B9A84
// extern ??? gUnknown_085B9AB4
// extern ??? gUnknown_085B9AD4
// extern ??? gUnknown_085B9B1C
// extern ??? gProc_efxHitQuakePure
// extern ??? gProc_efxQuake
// extern ??? gProc_efxHitQuake
// extern ??? gProc_efxFlashBG
// extern ??? gProc_efxWhiteOUT
// extern ??? gProc_efxWhiteIN
// extern ??? gProc_efxBlackOUT
// extern ??? gProc_efxBlackIN
// extern ??? gProc_efxFlashHPBar
// extern ??? gProc_efxHPBarColorChange
// extern ??? gProc_efxFlashUnit
// extern ??? gProc_efxFlashUnitEffect
// extern ??? gProc_efxStatusUnit
// extern ??? gProc_efxWeaponIcon
// extern ??? gProc_efxSpellCast
// extern ??? gProc_efxspdquake
// extern ??? gProc_ekrBattleStarting
// extern ??? gProc_ekrbattleendin
// extern ??? gUnknown_085B9B6C
// extern ??? gUnknown_085B9B84
// extern ??? gUnknown_085B9BA4
@ -1638,17 +1636,17 @@ extern const u16 gUnkUiFramePalettes[];
// extern ??? gUnknown_085B9CA4
// extern ??? gUnknown_085B9CC4
// extern ??? gUnknown_085B9CE4
// extern ??? gUnknown_085B9D0C
// extern ??? gUnknown_085B9D24
// extern ??? gUnknown_085B9D44
// extern ??? gProc_ekrWindowAppear
// extern ??? gProc_ekrNamewinAppear
// extern ??? gProc_ekrBaseAppear
// extern ??? gUnknown_085B9D5C
// extern ??? gUnknown_085B9D6C
// extern ??? gUnknown_085B9D94
// extern ??? gUnknown_085B9DAC
// extern ??? gUnknown_085B9DC4
// extern ??? gUnknown_085B9DDC
// extern ??? gUnknown_085B9E0C
// extern ??? gUnknown_085B9E34
// extern ??? gProc_ekrChienCHR
// extern ??? gProc_efxAnimeDrvProc
// extern ??? ProcScr_ekrUnitMainMini
// extern ??? gProc_ekrTogiInit
// extern ??? gProc_ekrTogiEnd
// extern ??? gProc_ekrTogiColor
// extern ??? gUnknown_085B9E4C
// extern ??? gUnknown_085BA0B8
// extern ??? gUnknown_085BA2E0

View File

@ -1,5 +1,5 @@
. = 0x000000; gUnknown_02000000 = .;
. = 0x000010; gUnknown_02000010 = .;
. = 0x000010; gAnims = .;
. = 0x000018; gUnknown_02000018 = .;
. = 0x00001C; gUnknown_0200001C = .;
. = 0x000020; gUnknown_02000020 = .;
@ -15,7 +15,7 @@
. = 0x000054; gUnknown_02000054 = .;
. = 0x00005C; gUnknown_0200005C = .;
. = 0x000060; gUnknown_02000060 = .;
. = 0x000064; gUnknown_02000064 = .;
. = 0x000064; gpProcEkrBattle = .;
. = 0x000068; gUnknown_02000068 = .;
. = 0x00006C; gUnknown_0200006C = .;
. = 0x000088; gUnknown_02000088 = .;
@ -552,23 +552,23 @@
. = 0x03DDE0; src/uiutils.o(ewram_data);
. = ALIGN(4); src/uiselecttarget.o(ewram_data);
. = 0x03E0F0; gUnknown_0203E0F0 = .;
. = 0x03E0F4; gUnknown_0203E0F4 = .;
. = 0x03E0F8; gUnknown_0203E0F8 = .;
. = 0x03E0F4; gBattleDeamonActive = .;
. = 0x03E0F8; gpProcEkrBattleDeamon = .;
. = 0x03E0FC; gUnknown_0203E0FC = .;
. = 0x03E0FE; gUnknown_0203E0FE = .;
. = 0x03E100; gUnknown_0203E100 = .;
. = 0x03E102; gUnknown_0203E102 = .;
. = 0x03E104; gUnknown_0203E104 = .;
. = 0x03E108; gUnknown_0203E108 = .;
. = 0x03E10C; gUnknown_0203E10C = .;
. = 0x03E110; gUnknown_0203E110 = .;
. = 0x03E10C; gBattleActorSide = .;
. = 0x03E110; gBattleInitSide = .;
. = 0x03E114; gUnknown_0203E114 = .;
. = 0x03E118; gUnknown_0203E118 = .;
. = 0x03E11A; gUnknown_0203E11A = .;
. = 0x03E11C; gUnknown_0203E11C = .;
. = 0x03E120; gUnknown_0203E120 = .;
. = 0x03E122; gUnknown_0203E122 = .;
. = 0x03E12A; gUnknown_0203E12A = .;
. = 0x03E12A; gAnimRoundData = .;
. = 0x03E152; gUnknown_0203E152 = .;
. = 0x03E156; gUnknown_0203E156 = .;
. = 0x03E182; gUnknown_0203E182 = .;