move model and sprite constants

Also: restructures rodata in overlay_01 and renames some vars and script
commands
This commit is contained in:
PikalaxALT 2021-12-29 11:34:29 -05:00
parent 5e786d1c92
commit ae4d64f856
1338 changed files with 5586 additions and 3768 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,3 +1,4 @@
#include "constants/sprites.h"
.include "asm/macros.inc"
.include "global.inc"
@ -14176,12 +14177,12 @@ ScrCmd_GetFriendSprite: ; 0x02046F34
bl ScriptEnvironment_GetSav2Ptr
bl Sav2_PlayerData_GetProfileAddr
bl PlayerProfile_GetTrainerGender
cmp r0, #0
cmp r0, #0 ; MALE
beq _02046F62
mov r0, #0
mov r0, #SPRITE_HERO
b _02046F64
_02046F62:
mov r0, #0x61
mov r0, #SPRITE_HEROINE
_02046F64:
strh r0, [r4]
mov r0, #1

View File

@ -6485,14 +6485,14 @@ sub_0205F1E4: ; 0x0205F1E4
bx lr
thumb_func_end sub_0205F1E4
thumb_func_start sub_0205F1EC
sub_0205F1EC: ; 0x0205F1EC
thumb_func_start FldObjSys_SetMModelNarc
FldObjSys_SetMModelNarc: ; 0x0205F1EC
str r1, [r0, #0x14]
bx lr
thumb_func_end sub_0205F1EC
thumb_func_end FldObjSys_SetMModelNarc
thumb_func_start sub_0205F1F0
sub_0205F1F0: ; 0x0205F1F0
thumb_func_start FldObjSys_GetMModelNarc
FldObjSys_GetMModelNarc: ; 0x0205F1F0
push {r4, lr}
add r4, r0, #0
ldr r0, [r4, #0x14]
@ -6503,7 +6503,7 @@ _0205F1FE:
ldr r0, [r4, #0x14]
pop {r4, pc}
.balign 4, 0
thumb_func_end sub_0205F1F0
thumb_func_end FldObjSys_GetMModelNarc
thumb_func_start sub_0205F204
sub_0205F204: ; 0x0205F204
@ -8432,7 +8432,7 @@ sub_0205FB34: ; 0x0205FB34
thumb_func_start sub_0205FB38
sub_0205FB38: ; 0x0205FB38
push {r3, lr}
bl ov01_021F92DC
bl GetObjectEventGfxInfoPtr
cmp r0, #0
bne _0205FB46
mov r0, #0

1
files/.gitignore vendored
View File

@ -42,3 +42,4 @@ itemtool/itemdata/item_icon.narc
itemtool/itemdata/item_data.narc
poketool/personal/growtbl.narc
resource/eng/pms_aikotoba/pms_aikotoba.narc
data/mmodel/mmodel.narc

View File

@ -0,0 +1,8 @@
# TODO: reverse the bins to more primitive types
MMODEL_ROOT := $(WORK_DIR)/files/data/mmodel/mmodel
MMODEL_BINS := $(wildcard $(MMODEL_ROOT)/*.bin)
MMODEL_NARC := $(MMODEL_ROOT).narc
$(MMODEL_NARC): $(MMODEL_BINS)
FS_CLEAN_TARGETS += $(MMODEL_NARC)

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

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