matching rom

This commit is contained in:
Evan
2019-11-18 21:03:51 -07:00
parent 422533386d
commit a26885c755
7 changed files with 137 additions and 93 deletions
+17 -16
View File
@@ -1,43 +1,44 @@
#include "constants/maps.h"
#include "constants/species.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
.section .rodata
.align 2
gUnknown_83CC2B8:: @ 83CC2B8
.incbin "baserom.gba", 0x3CC2B8, 0x20
.incbin "baserom.gba", 0x3CC2B8, 0x20
gUnknown_83CC2D8:: @ 83CC2D8
.incbin "baserom.gba", 0x3CC2D8, 0xC
.incbin "baserom.gba", 0x3CC2D8, 0xC
gUnknown_83CC2E4:: @ 83CC2E4
.incbin "baserom.gba", 0x3CC2E4, 0x20
.incbin "baserom.gba", 0x3CC2E4, 0x20
gUnknown_83CC304:: @ 83CC304
.incbin "baserom.gba", 0x3CC304, 0x10
.incbin "baserom.gba", 0x3CC304, 0x10
gUnknown_83CC314:: @ 83CC314
.incbin "baserom.gba", 0x3CC314, 0x1C
.incbin "baserom.gba", 0x3CC314, 0x1C
gUnknown_83CC330:: @ 83CC330
.incbin "baserom.gba", 0x3CC330, 0xC
.incbin "baserom.gba", 0x3CC330, 0xC
gUnknown_83CC33C:: @ 83CC33C
.incbin "baserom.gba", 0x3CC33C, 0x8
.incbin "baserom.gba", 0x3CC33C, 0x8
gUnknown_83CC344:: @ 83CC344
.incbin "baserom.gba", 0x3CC344, 0x8
.incbin "baserom.gba", 0x3CC344, 0x8
gUnknown_83CC34C:: @ 83CC34C
.incbin "baserom.gba", 0x3CC34C, 0x8
.incbin "baserom.gba", 0x3CC34C, 0x8
gUnknown_83CC354:: @ 83CC354
.incbin "baserom.gba", 0x3CC354, 0xC
.incbin "baserom.gba", 0x3CC354, 0xC
gUnknown_83CC360:: @ 83CC360
.incbin "baserom.gba", 0x3CC360, 0x3
.incbin "baserom.gba", 0x3CC360, 0x3
gUnknown_83CC363:: @ 83CC363
.incbin "baserom.gba", 0x3CC363, 0x3
.incbin "baserom.gba", 0x3CC363, 0x3
+15 -15
View File
@@ -2904,7 +2904,7 @@ gUnknown_8419D89:: @ 8419D89
.string "Waiting for the other TRAINER to\n"
.string "finish reading your TRAINER CARD.$"
gUnknown_8419DCC:: @ 8419DCC
gText_MenuOptionOption:: @ 8419DCC
.string "OPTION$"
gText_TextSpeed:: @ 0x8419DD3
@@ -2928,49 +2928,49 @@ gText_Frame:: @ 0x8419E0A
gText_OptionMenuCancel:: @ 0x8419E10
.string "CANCEL$"
gUnknown_8419E17:: @ 0x8419E17
gText_TextSpeedSlow:: @ 0x8419E17
.string "SLOW$"
gUnknown_8419E1C:: @ 0x8419E1C
gText_TextSpeedMid:: @ 0x8419E1C
.string "MID$"
gUnknown_8419E20:: @ 0x8419E20
gText_TextSpeedFast:: @ 0x8419E20
.string "FAST$"
gUnknown_8419E25:: @ 0x8419E25
gText_BattleSceneOn:: @ 0x8419E25
.string "ON$"
gUnknown_8419E28:: @ 0x8419E28
gText_BattleSceneOff:: @ 0x8419E28
.string "OFF$"
gUnknown_8419E2C:: @ 0x8419E2C
gText_BattleStyleShift:: @ 0x8419E2C
.string "SHIFT$"
gUnknown_8419E32:: @ 0x8419E32
gText_BattleStyleSet:: @ 0x8419E32
.string "SET$"
gUnknown_8419E36:: @ 0x8419E36
gText_SoundMono:: @ 0x8419E36
.string "MONO$"
gUnknown_8419E3B:: @ 0x8419E3B
gText_SoundStereo:: @ 0x8419E3B
.string "STEREO$"
gUnknown_8419E42:: @ 0x8419E42
.string "$"
gUnknown_8419E46:: @ 0x8419E46
gText_ButtonTypeNormal:: @ 0x8419E46
.string "HELP$"
gUnknown_8419E4B:: @ 0x8419E4B
gText_ButtonTypeLR:: @ 0x8419E4B
.string "LA$"
gUnknown_8419E4F:: @ 0x8419E4F
gText_ButtonTypeLEqualsA:: @ 0x8419E4F
.string "LR$"
gUnknown_8419E52:: @ 8419E52
gText_FrameType:: @ 8419E52
.string "TYPE$"
gUnknown_8419E57:: @ 8419E57
gText_PickSwitchCancel:: @ 8419E57
.string "{DPAD_UPDOWN}PICK {DPAD_LEFTRIGHT}SWITCH {A_BUTTON}{B_BUTTON}CANCEL$"
gUnknown_8419E72:: @ 0x8419E72