dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

union_room_player_avatar --> rfu_union_tool (by assert statements)

Browse Source
This commit is contained in:
PikalaxALT
2020-01-22 10:35:47 -05:00
parent 1e7df548fe
commit 70bb1a99e2
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/union_room_player_avatar.s → asm/rfu_union_tool.s
+10 -10
View File
@@ -338,7 +338,7 @@ sub_811B754: @ 811B754
ldr r0, _0811B798 @ =gUnknown_203B088 ldr r0, _0811B798 @ =gUnknown_203B088
movs r1, 0 movs r1, 0
str r1, [r0] str r1, [r0]
ldr r0, _0811B79C @ =gUnknown_203B084 ldr r0, _0811B79C @ =UnionObjWork
str r4, [r0] str r4, [r0]
cmp r4, 0 cmp r4, 0
bne _0811B774 bne _0811B774
@@ -369,7 +369,7 @@ _0811B77A:
bx r1 bx r1
.align 2, 0 .align 2, 0
_0811B798: .4byte gUnknown_203B088 _0811B798: .4byte gUnknown_203B088
_0811B79C: .4byte gUnknown_203B084 _0811B79C: .4byte UnionObjWork
_0811B7A0: .4byte gUnknown_8457138 _0811B7A0: .4byte gUnknown_8457138
_0811B7A4: .4byte gUnknown_8457178 _0811B7A4: .4byte gUnknown_8457178
thumb_func_end sub_811B754 thumb_func_end sub_811B754
@@ -518,7 +518,7 @@ sub_811B8BC: @ 811B8BC
push {r4-r6,lr} push {r4-r6,lr}
adds r5, r1, 0 adds r5, r1, 0
adds r6, r2, 0 adds r6, r2, 0
ldr r1, _0811B8F4 @ =gUnknown_203B084 ldr r1, _0811B8F4 @ =UnionObjWork
lsls r0, 2 lsls r0, 2
ldr r1, [r1] ldr r1, [r1]
adds r4, r1, r0 adds r4, r1, r0
@@ -542,7 +542,7 @@ _0811B8DA:
movs r0, 0 movs r0, 0
b _0811B906 b _0811B906
.align 2, 0 .align 2, 0
_0811B8F4: .4byte gUnknown_203B084 _0811B8F4: .4byte UnionObjWork
_0811B8F8: .4byte gUnknown_8457138 _0811B8F8: .4byte gUnknown_8457138
_0811B8FC: .4byte 0x00000231 _0811B8FC: .4byte 0x00000231
_0811B900: .4byte gUnknown_8457178 _0811B900: .4byte gUnknown_8457178
@@ -557,7 +557,7 @@ _0811B906:
thumb_func_start sub_811B90C thumb_func_start sub_811B90C
sub_811B90C: @ 811B90C sub_811B90C: @ 811B90C
push {r4,lr} push {r4,lr}
ldr r1, _0811B934 @ =gUnknown_203B084 ldr r1, _0811B934 @ =UnionObjWork
lsls r0, 2 lsls r0, 2
ldr r1, [r1] ldr r1, [r1]
adds r4, r1, r0 adds r4, r1, r0
@@ -577,7 +577,7 @@ _0811B926:
movs r0, 0 movs r0, 0
b _0811B946 b _0811B946
.align 2, 0 .align 2, 0
_0811B934: .4byte gUnknown_203B084 _0811B934: .4byte UnionObjWork
_0811B938: .4byte gUnknown_8457138 _0811B938: .4byte gUnknown_8457138
_0811B93C: .4byte 0x00000241 _0811B93C: .4byte 0x00000241
_0811B940: .4byte gUnknown_8457178 _0811B940: .4byte gUnknown_8457178
@@ -669,7 +669,7 @@ _0811B9CE:
thumb_func_start sub_811B9D8 thumb_func_start sub_811B9D8
sub_811B9D8: @ 811B9D8 sub_811B9D8: @ 811B9D8
push {r4,r5,lr} push {r4,r5,lr}
ldr r5, _0811BA08 @ =gUnknown_203B084 ldr r5, _0811BA08 @ =UnionObjWork
ldr r0, [r5] ldr r0, [r5]
cmp r0, 0 cmp r0, 0
bne _0811B9EE bne _0811B9EE
@@ -693,7 +693,7 @@ _0811B9F0:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_0811BA08: .4byte gUnknown_203B084 _0811BA08: .4byte UnionObjWork
_0811BA0C: .4byte gUnknown_8457138 _0811BA0C: .4byte gUnknown_8457138
_0811BA10: .4byte 0x00000283 _0811BA10: .4byte 0x00000283
_0811BA14: .4byte gUnknown_8457178 _0811BA14: .4byte gUnknown_8457178
@@ -768,7 +768,7 @@ _0811BA92:
adds r4, 0x1 adds r4, 0x1
cmp r4, 0x7 cmp r4, 0x7
ble _0811BA7C ble _0811BA7C
ldr r1, _0811BAA8 @ =gUnknown_203B084 ldr r1, _0811BAA8 @ =UnionObjWork
movs r0, 0 movs r0, 0
str r0, [r1] str r0, [r1]
bl sub_811BA5C bl sub_811BA5C
@@ -776,7 +776,7 @@ _0811BA92:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_0811BAA8: .4byte gUnknown_203B084 _0811BAA8: .4byte UnionObjWork
thumb_func_end sub_811BA78 thumb_func_end sub_811BA78
thumb_func_start sub_811BAAC thumb_func_start sub_811BAAC
data/union_room_player_avatar.s → data/rfu_union_tool.s
View File
include/union_room_player_avatar.h → include/rfu_union_tool.h
View File
ld_script.txt
+2 -2
View File
@@ -242,7 +242,7 @@ SECTIONS {
src/menu.o(.text); src/menu.o(.text);
src/quest_log.o(.text); src/quest_log.o(.text);
src/union_room.o(.text); src/union_room.o(.text);
asm/union_room_player_avatar.o(.text); asm/rfu_union_tool.o(.text);
asm/pokemon_special_anim.o(.text); asm/pokemon_special_anim.o(.text);
src/party_menu.o(.text); src/party_menu.o(.text);
asm/union_room_chat.o(.text); asm/union_room_chat.o(.text);
@@ -528,7 +528,7 @@ SECTIONS {
src/menu.o(.rodata); src/menu.o(.rodata);
src/quest_log.o(.rodata); src/quest_log.o(.rodata);
src/union_room.o(.rodata); src/union_room.o(.rodata);
data/union_room_player_avatar.o(.rodata); data/rfu_union_tool.o(.rodata);
data/union_room_message.o(.rodata); data/union_room_message.o(.rodata);
data/pokemon_special_anim.o(.rodata); data/pokemon_special_anim.o(.rodata);
src/party_menu.o(.rodata); src/party_menu.o(.rodata);
src/union_room.c
+1 -1
View File
@@ -38,7 +38,7 @@
#include "trainer_card.h" #include "trainer_card.h"
#include "union_room.h" #include "union_room.h"
#include "union_room_chat.h" #include "union_room_chat.h"
#include "union_room_player_avatar.h" #include "rfu_union_tool.h"
#include "union_room_message.h" #include "union_room_message.h"
#include "constants/songs.h" #include "constants/songs.h"
#include "constants/maps.h" #include "constants/maps.h"
sym_ewram.txt
+1 -1
View File
@@ -354,7 +354,7 @@ gUnknown_203ACF0: @ 203ACF0
.include "src/union_room.o" .include "src/union_room.o"
.align 2 .align 2
gUnknown_203B084: @ 203B084 UnionObjWork: @ 203B084
.space 0x4 .space 0x4
gUnknown_203B088: @ 203B088 gUnknown_203B088: @ 203B088