Split remaining union room data
This commit is contained in:
PikalaxALT
@@ -4,75 +4,8 @@
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
.section .rodata
|
||||
.align 2
|
||||
|
||||
@ starts at gUnknown_082F0474 in pokeemerald, union link groups
|
||||
|
||||
gUnknown_84570D8:: @ 84570D8
|
||||
.byte 0x29, 0x36, 0x27, 0x12, 0x13, 0x14, 0x19, 0x1A, 0x00, 0x00, 0x2A, 0x3A, 0x28, 0x16, 0x17, 0x18, 0x1C, 0x1D, 0x00, 0x00
|
||||
|
||||
gUnknown_84570EC:: @ 84570EC
|
||||
.2byte 0x0004
|
||||
.2byte 0x0006
|
||||
.2byte 0x000D
|
||||
.2byte 0x0008
|
||||
.2byte 0x000A
|
||||
.2byte 0x0006
|
||||
.2byte 0x0001
|
||||
.2byte 0x0008
|
||||
.2byte 0x000D
|
||||
.2byte 0x0004
|
||||
.2byte 0x0007
|
||||
.2byte 0x0004
|
||||
.2byte 0x0001
|
||||
.2byte 0x0004
|
||||
.2byte 0x0007
|
||||
.2byte 0x0008
|
||||
|
||||
gUnknown_845710C:: @ 845710C
|
||||
.byte 0x00, 0x00, 0x01, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x01
|
||||
|
||||
gUnknown_8457116:: @ 8457116
|
||||
.byte 0x00, 0x02, 0x01, 0x04, 0x03
|
||||
|
||||
gUnknown_845711B:: @ 845711B
|
||||
.byte 0x01, 0x03, 0x01, 0x04, 0x02
|
||||
|
||||
gUnknown_8457120:: @ 8457120
|
||||
.byte 0x09, 0x08, 0x07, 0x02, 0x06, 0x05, 0x04, 0x03, 0x63, 0x00, 0x64, 0x00, 0x65, 0x00, 0x66, 0x00, 0x67, 0x00, 0x68, 0x00, 0x69, 0x00, 0x6A, 0x00
|
||||
|
||||
.align 2
|
||||
gUnknown_8457138:: @ 8457138
|
||||
abspath "rfu_union_tool.c"
|
||||
|
||||
.align 2
|
||||
gUnknown_8457174:: @ 8457174
|
||||
.asciz "0"
|
||||
|
||||
.align 2
|
||||
gUnknown_8457178:: @ 8457178
|
||||
.asciz "UnionObjWork != NULL"
|
||||
|
||||
gUnknown_845718D:: @ 845718D
|
||||
.byte 0xA4, 0xFE
|
||||
|
||||
gUnknown_845718F:: @ 845718F
|
||||
.byte 0xA5, 0xFE, 0x00, 0x00, 0x00
|
||||
|
||||
gUnknown_8457194:: @ 8457194
|
||||
.2byte 0x01FC, 0x0000 @ BgTemplate
|
||||
|
||||
gUnknown_8457198:: @ 8457198
|
||||
.byte 0x00, 0x02, 0x0F, 0x1A, 0x04, 0x0E @ window template
|
||||
.2byte 0x0014
|
||||
|
||||
@ ???
|
||||
.byte -1, 0, 0, 0
|
||||
.byte 0, 0, 0, 0
|
||||
|
||||
gUnknown_84571A8:: @ 84571A8
|
||||
.byte 0x01, 0x02, 0x03, 0x00
|
||||
|
||||
gUnknown_84571AC:: @ 84571AC
|
||||
.string "$"
|
||||
|
||||
@@ -261,7 +194,7 @@ gUnknown_8457554:: @ 8457554
|
||||
.string "An “OK” was sent\nto {STR_VAR_1}.$"
|
||||
|
||||
.align 2
|
||||
gUnknown_845756C:: @ 845756C
|
||||
gUnknown_845756C:: @ 845756C
|
||||
.string "The other TRAINER doesn't appear\nto be available now…\p$"
|
||||
|
||||
.align 2
|
||||
@@ -315,7 +248,7 @@ gUnknown_845771C:: @ 845771C
|
||||
.string "Quit being a member?$"
|
||||
|
||||
.align 2
|
||||
gUnknown_8457734:: @ 8457734
|
||||
gUnknown_8457734:: @ 8457734
|
||||
.string "You stopped being a member.\p$"
|
||||
|
||||
.align 2
|
||||
@@ -0,0 +1,73 @@
|
||||
#include "constants/region_map.h"
|
||||
#include "constants/flags.h"
|
||||
#include "constants/moves.h"
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
.section .rodata
|
||||
.align 2
|
||||
|
||||
gUnknown_84570D8:: @ 84570D8
|
||||
.byte 0x29, 0x36, 0x27, 0x12, 0x13, 0x14, 0x19, 0x1A, 0x00, 0x00, 0x2A, 0x3A, 0x28, 0x16, 0x17, 0x18, 0x1C, 0x1D, 0x00, 0x00
|
||||
|
||||
gUnknown_84570EC:: @ 84570EC
|
||||
.2byte 0x0004
|
||||
.2byte 0x0006
|
||||
.2byte 0x000D
|
||||
.2byte 0x0008
|
||||
.2byte 0x000A
|
||||
.2byte 0x0006
|
||||
.2byte 0x0001
|
||||
.2byte 0x0008
|
||||
.2byte 0x000D
|
||||
.2byte 0x0004
|
||||
.2byte 0x0007
|
||||
.2byte 0x0004
|
||||
.2byte 0x0001
|
||||
.2byte 0x0004
|
||||
.2byte 0x0007
|
||||
.2byte 0x0008
|
||||
|
||||
gUnknown_845710C:: @ 845710C
|
||||
.byte 0x00, 0x00, 0x01, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x01
|
||||
|
||||
gUnknown_8457116:: @ 8457116
|
||||
.byte 0x00, 0x02, 0x01, 0x04, 0x03
|
||||
|
||||
gUnknown_845711B:: @ 845711B
|
||||
.byte 0x01, 0x03, 0x01, 0x04, 0x02
|
||||
|
||||
gUnknown_8457120:: @ 8457120
|
||||
.byte 0x09, 0x08, 0x07, 0x02, 0x06, 0x05, 0x04, 0x03, 0x63, 0x00, 0x64, 0x00, 0x65, 0x00, 0x66, 0x00, 0x67, 0x00, 0x68, 0x00, 0x69, 0x00, 0x6A, 0x00
|
||||
|
||||
.align 2
|
||||
gUnknown_8457138:: @ 8457138
|
||||
abspath "rfu_union_tool.c"
|
||||
|
||||
.align 2
|
||||
gUnknown_8457174:: @ 8457174
|
||||
.asciz "0"
|
||||
|
||||
.align 2
|
||||
gUnknown_8457178:: @ 8457178
|
||||
.asciz "UnionObjWork != NULL"
|
||||
|
||||
gUnknown_845718D:: @ 845718D
|
||||
.byte 0xA4, 0xFE
|
||||
|
||||
gUnknown_845718F:: @ 845718F
|
||||
.byte 0xA5, 0xFE
|
||||
|
||||
.align 2
|
||||
gUnknown_8457194:: @ 8457194
|
||||
.2byte 0x01FC, 0x0000 @ BgTemplate
|
||||
|
||||
gUnknown_8457198:: @ 8457198
|
||||
.byte 0x00, 0x02, 0x0F, 0x1A, 0x04, 0x0E @ window template
|
||||
.2byte 0x0014
|
||||
|
||||
@ ???
|
||||
.byte -1, 0, 0, 0
|
||||
.byte 0, 0, 0, 0
|
||||
|
||||
gUnknown_84571A8:: @ 84571A8
|
||||
.byte 0x01, 0x02, 0x03, 0x00
|
||||
@@ -0,0 +1,107 @@
|
||||
extern const u8 gUnknown_84571AC[];
|
||||
extern const u8 gUnknown_84571B0[];
|
||||
extern const u8 gUnknown_84571B4[];
|
||||
extern const u8 gUnknown_84571B8[];
|
||||
extern const u8 gUnknown_84571E0[];
|
||||
extern const u8 gUnknown_8457234[];
|
||||
extern const u8 gUnknown_8457264[];
|
||||
extern const u8 *const gUnknown_845742C[][5];
|
||||
extern const u8 gUnknown_845747C[];
|
||||
extern const u8 gUnknown_84574A0[];
|
||||
extern const u8 gUnknown_84574C4[];
|
||||
extern const u8 gUnknown_84574EC[];
|
||||
extern const u8 gUnknown_8457514[];
|
||||
extern const u8 gUnknown_8457530[];
|
||||
extern const u8 gUnknown_8457554[];
|
||||
extern const u8 *const gUnknown_8457608[];
|
||||
extern const u8 gUnknown_8457610[];
|
||||
extern const u8 *const gUnknown_845767C[];
|
||||
extern const u8 gUnknown_84576AC[];
|
||||
extern const u8 gUnknown_84576C4[];
|
||||
extern const u8 gUnknown_8457700[];
|
||||
extern const u8 gUnknown_845771C[];
|
||||
extern const u8 *const gUnknown_8457754[];
|
||||
extern const u8 gUnknown_845777C[];
|
||||
extern const u8 gUnknown_84577BC[];
|
||||
extern const u8 gUnknown_84577F8[];
|
||||
extern const u8 *const gUnknown_8457838[];
|
||||
extern const u8 gUnknown_84578BC[];
|
||||
extern const u8 *const gUnknown_8457A34[];
|
||||
extern const u8 *const gUnknown_8457B04[][2];
|
||||
extern const u8 *const gUnknown_8457BCC[];
|
||||
extern const u8 *const gUnknown_8457C20[];
|
||||
extern const u8 gUnknown_8457C48[];
|
||||
extern const u8 gUnknown_8457CA4[];
|
||||
extern const u8 gUnknown_8457CF8[];
|
||||
extern const u8 gUnknown_8457D44[];
|
||||
extern const u8 gUnknown_8457DB8[];
|
||||
extern const u8 gUnknown_8457E0C[];
|
||||
extern const u8 gUnknown_8457E28[];
|
||||
extern const u8 gUnknown_8457E44[];
|
||||
extern const u8 gUnknown_8457E60[];
|
||||
extern const u8 *const gUnknown_8457F80[][2];
|
||||
extern const u8 gUnknown_8457F90[];
|
||||
extern const u8 *const gUnknown_84580F4[][4];
|
||||
extern const u8 *const gUnknown_8458230[][2][3];
|
||||
extern const u8 *const gUnknown_8458314[];
|
||||
extern const u8 *const gUnknown_84583B4[];
|
||||
extern const u8 *const gUnknown_845842C[];
|
||||
extern const u8 gUnknown_8458434[];
|
||||
extern const u8 gUnknown_845847C[];
|
||||
extern const u8 gUnknown_84584C0[];
|
||||
extern const u8 *const gUnknown_8458548[];
|
||||
extern const u8 *const gUnknown_84585E8[];
|
||||
extern const u8 *const gUnknown_8458758[2][4];
|
||||
extern const u8 *const gUnknown_84588BC[2][4];
|
||||
extern const u8 *const gUnknown_84589AC[2][2];
|
||||
extern const u8 *const gUnknown_8458A78[2][4];
|
||||
extern const u8 gUnknown_8458A98[];
|
||||
extern const u8 gUnknown_8458AB8[];
|
||||
extern const u8 gUnknown_8458B44[];
|
||||
extern const u8 gUnknown_8458CD4[];
|
||||
extern const u8 gUnknown_8458D1C[];
|
||||
extern const u8 gUnknown_8458D54[];
|
||||
extern const u8 gUnknown_8458D78[];
|
||||
extern const u8 gUnknown_8458D9C[];
|
||||
extern const u8 gUnknown_8458DBC[];
|
||||
extern const u8 gUnknown_8458DE8[];
|
||||
extern const u8 gUnknown_8458E10[];
|
||||
extern const u8 gUnknown_8458E70[];
|
||||
extern const u8 gUnknown_8458ED0[];
|
||||
extern const u8 gUnknown_8458F04[];
|
||||
extern const u8 gUnknown_8458F9C[];
|
||||
extern const u8 gUnknown_8458FBC[];
|
||||
extern const u8 gUnknown_8458FC8[];
|
||||
extern const u8 gUnknown_8458FE4[];
|
||||
extern const u8 gUnknown_84591DC[];
|
||||
extern const u8 *const gUnknown_84591B8[];
|
||||
extern const u8 gUnknown_8459238[];
|
||||
extern const u8 gUnknown_8459250[];
|
||||
extern const u8 gUnknown_845928C[];
|
||||
extern const u8 *const gUnknown_845933C[];
|
||||
extern const u8 gUnknown_8459344[];
|
||||
extern const u8 gUnknown_845934C[];
|
||||
extern const u8 gUnknown_8459354[];
|
||||
extern const u8 gUnknown_8459360[];
|
||||
extern const u8 gUnknown_8459368[];
|
||||
extern const u8 gUnknown_8459370[];
|
||||
extern const u8 gUnknown_8459378[];
|
||||
extern const u8 gUnknown_8459394[];
|
||||
extern const u8 gUnknown_84593A4[];
|
||||
extern const u8 gUnknown_84593B4[];
|
||||
extern const u8 gUnknown_84593C4[];
|
||||
extern const u8 gUnknown_84593D4[];
|
||||
extern const u8 gUnknown_84593E4[];
|
||||
extern const u8 gUnknown_84593F4[];
|
||||
extern const u8 gUnknown_84593DC[];
|
||||
extern const u8 gUnknown_8459400[];
|
||||
extern const u8 gUnknown_8459410[];
|
||||
extern const u8 gUnknown_845941C[];
|
||||
extern const u8 gUnknown_845942C[];
|
||||
extern const u8 gUnknown_8459434[];
|
||||
extern const u8 gUnknown_8459440[];
|
||||
extern const u8 *const gUnknown_84594B0[];
|
||||
extern const u8 gUnknown_84594C4[];
|
||||
extern const u8 gUnknown_8459504[];
|
||||
extern const u8 *const gUnknown_8459580[];
|
||||
extern const u8 gUnknown_8459588[];
|
||||
+2
-1
@@ -528,7 +528,8 @@ SECTIONS {
|
||||
src/menu.o(.rodata);
|
||||
src/quest_log.o(.rodata);
|
||||
src/union_room.o(.rodata);
|
||||
data/union_room.o(.rodata);
|
||||
data/union_room_player_avatar.o(.rodata);
|
||||
data/union_room_message.o(.rodata);
|
||||
data/pokemon_special_anim.o(.rodata);
|
||||
src/party_menu.o(.rodata);
|
||||
data/union_room_chat.o(.rodata);
|
||||
|
||||
@@ -1,24 +1,3 @@
|
||||
extern const u8 gUnknown_84571AC[];
|
||||
extern const u8 gUnknown_8459344[];
|
||||
extern const u8 gUnknown_845934C[];
|
||||
extern const u8 gUnknown_8459354[];
|
||||
extern const u8 gUnknown_8459360[];
|
||||
extern const u8 gUnknown_8459368[];
|
||||
extern const u8 gUnknown_8459370[];
|
||||
extern const u8 gUnknown_8459394[];
|
||||
extern const u8 gUnknown_84593A4[];
|
||||
extern const u8 gUnknown_84593B4[];
|
||||
extern const u8 gUnknown_84593C4[];
|
||||
extern const u8 gUnknown_84593D4[];
|
||||
extern const u8 gUnknown_84593E4[];
|
||||
extern const u8 gUnknown_84593F4[];
|
||||
extern const u8 gUnknown_84593DC[];
|
||||
extern const u8 gUnknown_8459400[];
|
||||
extern const u8 gUnknown_8459410[];
|
||||
extern const u8 gUnknown_845941C[];
|
||||
extern const u8 gUnknown_845942C[];
|
||||
extern const u8 gUnknown_8459434[];
|
||||
extern const u8 gUnknown_8459440[];
|
||||
|
||||
#define _8456CD8(a, b) ((a) | ((b) << 8))
|
||||
|
||||
@@ -446,91 +425,4 @@ static const u8 *const gUnknown_8457094[] = {
|
||||
|
||||
static const u8 gUnknown_84570C8[] = {0x01, 0x02, 0x03, 0x04, 0x09, 0x0A, 0x0B, 0x15, 0x16, 0xF7, 0x00, 0xAF, 0xF7, 0x01, 0xFF, 0x00};
|
||||
|
||||
extern const u8 gUnknown_84571B0[];
|
||||
extern const u8 gUnknown_84571B4[];
|
||||
extern const u8 gUnknown_84571B8[];
|
||||
extern const u8 gUnknown_84571E0[];
|
||||
extern const u8 gUnknown_8457234[];
|
||||
extern const u8 gUnknown_8457264[];
|
||||
extern const u8 *const gUnknown_845742C[][5];
|
||||
extern const u8 gUnknown_845747C[];
|
||||
extern const u8 gUnknown_84574A0[];
|
||||
extern const u8 gUnknown_84574C4[];
|
||||
extern const u8 gUnknown_84574EC[];
|
||||
extern const u8 gUnknown_8457514[];
|
||||
extern const u8 gUnknown_8457530[];
|
||||
extern const u8 gUnknown_8457554[];
|
||||
extern const u8 *const gUnknown_8457608[];
|
||||
extern const u8 gUnknown_8457610[];
|
||||
extern const u8 *const gUnknown_845767C[];
|
||||
extern const u8 gUnknown_84576AC[];
|
||||
extern const u8 gUnknown_84576C4[];
|
||||
extern const u8 gUnknown_8457700[];
|
||||
extern const u8 gUnknown_845771C[];
|
||||
extern const u8 *const gUnknown_8457754[];
|
||||
extern const u8 gUnknown_845777C[];
|
||||
extern const u8 gUnknown_84577BC[];
|
||||
extern const u8 gUnknown_84577F8[];
|
||||
extern const u8 *const gUnknown_8457838[];
|
||||
extern const u8 gUnknown_84578BC[];
|
||||
extern const u8 *const gUnknown_8457A34[];
|
||||
extern const u8 *const gUnknown_8457B04[][2];
|
||||
extern const u8 *const gUnknown_8457BCC[];
|
||||
extern const u8 *const gUnknown_8457C20[];
|
||||
extern const u8 gUnknown_8457C48[];
|
||||
extern const u8 gUnknown_8457CA4[];
|
||||
extern const u8 gUnknown_8457CF8[];
|
||||
extern const u8 gUnknown_8457D44[];
|
||||
extern const u8 gUnknown_8457DB8[];
|
||||
extern const u8 gUnknown_8457E0C[];
|
||||
extern const u8 gUnknown_8457E28[];
|
||||
extern const u8 gUnknown_8457E44[];
|
||||
extern const u8 gUnknown_8457E60[];
|
||||
extern const u8 *const gUnknown_8457F80[][2];
|
||||
extern const u8 gUnknown_8457F90[];
|
||||
extern const u8 *const gUnknown_84580F4[][4];
|
||||
extern const u8 *const gUnknown_8458230[][2][3];
|
||||
extern const u8 *const gUnknown_8458314[];
|
||||
extern const u8 *const gUnknown_84583B4[];
|
||||
extern const u8 *const gUnknown_845842C[];
|
||||
extern const u8 gUnknown_8458434[];
|
||||
extern const u8 gUnknown_845847C[];
|
||||
extern const u8 gUnknown_84584C0[];
|
||||
extern const u8 *const gUnknown_8458548[];
|
||||
extern const u8 *const gUnknown_84585E8[];
|
||||
extern const u8 *const gUnknown_8458758[2][4];
|
||||
extern const u8 *const gUnknown_84588BC[2][4];
|
||||
extern const u8 *const gUnknown_84589AC[2][2];
|
||||
extern const u8 *const gUnknown_8458A78[2][4];
|
||||
extern const u8 gUnknown_8458A98[];
|
||||
extern const u8 gUnknown_8458AB8[];
|
||||
extern const u8 gUnknown_8458B44[];
|
||||
extern const u8 gUnknown_8458CD4[];
|
||||
extern const u8 gUnknown_8458D1C[];
|
||||
extern const u8 gUnknown_8458D54[];
|
||||
extern const u8 gUnknown_8458D78[];
|
||||
extern const u8 gUnknown_8458D9C[];
|
||||
extern const u8 gUnknown_8458DBC[];
|
||||
extern const u8 gUnknown_8458DE8[];
|
||||
extern const u8 gUnknown_8458E10[];
|
||||
extern const u8 gUnknown_8458E70[];
|
||||
extern const u8 gUnknown_8458ED0[];
|
||||
extern const u8 gUnknown_8458F04[];
|
||||
extern const u8 gUnknown_8458F9C[];
|
||||
extern const u8 gUnknown_8458FBC[];
|
||||
extern const u8 gUnknown_8458FC8[];
|
||||
extern const u8 gUnknown_8458FE4[];
|
||||
extern const u8 gUnknown_84591DC[];
|
||||
extern const u8 *const gUnknown_84591B8[];
|
||||
extern const u8 gUnknown_8459238[];
|
||||
extern const u8 gUnknown_8459250[];
|
||||
extern const u8 gUnknown_845928C[];
|
||||
extern const u8 *const gUnknown_845933C[];
|
||||
extern const u8 gUnknown_8459378[];
|
||||
extern const u8 *const gUnknown_84594B0[];
|
||||
extern const u8 gUnknown_84594C4[];
|
||||
extern const u8 gUnknown_8459504[];
|
||||
extern const u8 *const gUnknown_8459580[];
|
||||
extern const u8 gUnknown_8459588[];
|
||||
|
||||
#undef _8456CD8
|
||||
|
||||
+7
-6
@@ -39,6 +39,7 @@
|
||||
#include "union_room.h"
|
||||
#include "union_room_chat.h"
|
||||
#include "union_room_player_avatar.h"
|
||||
#include "union_room_message.h"
|
||||
#include "constants/songs.h"
|
||||
#include "constants/maps.h"
|
||||
#include "constants/cable_club.h"
|
||||
@@ -131,20 +132,20 @@ void sub_811BA78(void);
|
||||
|
||||
#include "data/union_room.h"
|
||||
|
||||
// These are functions in Emmerald but inlined in FireRed
|
||||
// These are functions in Emerald but inlined in FireRed
|
||||
|
||||
#define IntlConvPartnerUname7(dest, arg1) ({ \
|
||||
StringCopy7(dest, (arg1).unk.playerName); \
|
||||
#define IntlConvPartnerUname7(dest, arg1) ({ \
|
||||
StringCopy7(dest, (arg1).unk.playerName); \
|
||||
ConvertInternationalString(dest, (arg1).unk.field_0.unk_00.unk_00_0); \
|
||||
})
|
||||
|
||||
#define IntlConvPartnerUname(dest, arg1) ({ \
|
||||
StringCopy(dest, (arg1).unk.playerName); \
|
||||
#define IntlConvPartnerUname(dest, arg1) ({ \
|
||||
StringCopy(dest, (arg1).unk.playerName); \
|
||||
ConvertInternationalString(dest, (arg1).unk.field_0.unk_00.unk_00_0); \
|
||||
})
|
||||
|
||||
#define CopyTrainerCardData(dest, src, _version) ({ \
|
||||
(dest) = *((struct TrainerCard * )(src)); \
|
||||
(dest) = *((struct TrainerCard * )(src)); \
|
||||
(dest).version = _version; \
|
||||
})
|
||||
|
||||
|
||||
Reference in New Issue
Block a user