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

Merge branch 'master' into doc-routes1

Browse Source
This commit is contained in:
GriffinR
2020-02-16 13:53:31 -05:00
committed by GitHub
parent a1ea8cc829 13357596b7
commit 058d30fe80
1890 changed files with 20092 additions and 20517 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+3
View File
@@ -173,6 +173,9 @@ $(C_BUILDDIR)/isagbprn.o: CFLAGS := -mthumb-interwork
$(C_BUILDDIR)/trainer_tower.o: CFLAGS += -ffreestanding
$(C_BUILDDIR)/flying.o: CFLAGS += -ffreestanding
$(C_BUILDDIR)/librfu_intr.o: CC1 := tools/agbcc/bin/agbcc_arm
$(C_BUILDDIR)/librfu_intr.o: CFLAGS := -O2 -mthumb-interwork -quiet
ifeq ($(NODEP),1)
$(C_BUILDDIR)/%.o: c_dep :=
else
asm/battle_bg.s
+2 -2
View File
@@ -1270,7 +1270,7 @@ _0800FBF8:
_0800FC00: .4byte gTrainers
_0800FC04: .4byte gTrainerBattleOpponent_A
_0800FC08:
bl sav1_map_get_battletype
bl GetCurrentMapBattleScene
lsls r0, 24
cmp r0, 0
bne _0800FC20
@@ -1341,7 +1341,7 @@ _0800FC88:
movs r0, 0x13
b _0800FCAA
_0800FC90:
bl sav1_map_get_battletype
bl GetCurrentMapBattleScene
lsls r0, 24
lsrs r0, 24
cmp r0, 0
asm/berry_crush.s
+4 -4
View File
@@ -45,7 +45,7 @@ _0814B716:
ldr r0, _0814B74C @ =0x0000012f
bl PlayNewMapMusic
ldr r0, _0814B750 @ =sub_8056534
bl sub_80565E0
bl SetMainCallback1
_0814B73E:
movs r0, 0
_0814B740:
@@ -58,8 +58,8 @@ _0814B74C: .4byte 0x0000012f
_0814B750: .4byte sub_8056534
thumb_func_end sub_814B6FC
thumb_func_start sub_814B754
sub_814B754: @ 814B754
thumb_func_start StartBerryCrush
StartBerryCrush: @ 814B754
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -183,7 +183,7 @@ _0814B84C:
.align 2, 0
_0814B858: .4byte sub_814BA80
_0814B85C: .4byte sub_814BA98
thumb_func_end sub_814B754
thumb_func_end StartBerryCrush
thumb_func_start sub_814B860
sub_814B860: @ 814B860
asm/berry_crush_2.s
+17 -17
View File
@@ -143,7 +143,7 @@ _0814BC30:
movs r0, 0x3
b _0814BC6A
_0814BC44:
bl sub_80FA42C
bl LinkRfu_SetRfuFuncToSend6600
b _0814BC66
_0814BC4A:
bl IsLinkTaskFinished
@@ -359,7 +359,7 @@ sub_814BDBC: @ 814BDBC
beq _0814BDD2
b _0814BDFC
_0814BDCC:
bl sub_80FA42C
bl LinkRfu_SetRfuFuncToSend6600
b _0814BDFC
_0814BDD2:
bl IsLinkTaskFinished
@@ -494,7 +494,7 @@ _0814BEB4:
bl sub_814BB4C
b _0814BFC6
_0814BED4:
bl sub_80FA42C
bl LinkRfu_SetRfuFuncToSend6600
b _0814BFC0
_0814BEDA:
bl IsLinkTaskFinished
@@ -650,7 +650,7 @@ _0814C008:
adds r1, r4, r0
adds r0, r4, 0
bl sub_814DA24
bl sub_80FA42C
bl LinkRfu_SetRfuFuncToSend6600
b _0814C108
_0814C01A:
bl IsLinkTaskFinished
@@ -720,7 +720,7 @@ _0814C080:
ldrb r0, [r2]
adds r0, 0x1
strb r0, [r2]
bl sub_80FA42C
bl LinkRfu_SetRfuFuncToSend6600
b _0814C108
.align 2, 0
_0814C0AC: .4byte sub_814DB84
@@ -748,7 +748,7 @@ _0814C0D2:
adds r1, r4, r3
adds r0, r4, 0
bl sub_814DC24
bl sub_80FA42C
bl LinkRfu_SetRfuFuncToSend6600
b _0814C108
_0814C0E4:
bl IsLinkTaskFinished
@@ -904,7 +904,7 @@ _0814C1FC:
movs r0, 0x1E
movs r1, 0
bl SetGpuReg
bl sub_80FA42C
bl LinkRfu_SetRfuFuncToSend6600
b _0814C23C
_0814C21E:
bl IsLinkTaskFinished
@@ -962,14 +962,14 @@ _0814C26C:
adds r0, r1, 0
movs r2, 0x78
movs r3, 0x50
bl sub_815F138
bl StartMinigameCountdown
b _0814C2EC
_0814C28A:
bl sub_815F198
bl IsMinigameCountdownRunning
cmp r0, 0
bne _0814C2F2
_0814C292:
bl sub_80FA42C
bl LinkRfu_SetRfuFuncToSend6600
b _0814C2EC
_0814C298:
bl IsLinkTaskFinished
@@ -1655,7 +1655,7 @@ _0814C77A:
movs r2, 0xC
bl memcpy
adds r0, r4, 0
bl sub_80F9E2C
bl RfuPrepareSend0x2f00
_0814C7AC:
pop {r3}
mov r8, r3
@@ -2065,7 +2065,7 @@ _0814CADA:
bl sub_814DE50
cmp r0, 0
beq _0814CB18
bl sub_80FA42C
bl LinkRfu_SetRfuFuncToSend6600
movs r0, 0
strh r0, [r4, 0x10]
b _0814CB12
@@ -2158,7 +2158,7 @@ _0814CB8A:
bl sub_814DE50
cmp r0, 0
beq _0814CC02
bl sub_80FA42C
bl LinkRfu_SetRfuFuncToSend6600
movs r0, 0
strh r0, [r5, 0x10]
movs r0, 0x12
@@ -2846,7 +2846,7 @@ _0814D0D6:
.align 2, 0
_0814D0FC: .4byte 0x00008c9f
_0814D100:
bl sub_80FA42C
bl LinkRfu_SetRfuFuncToSend6600
b _0814D178
_0814D106:
bl IsLinkTaskFinished
@@ -3028,7 +3028,7 @@ _0814D256:
beq _0814D296
b _0814D30C
_0814D260:
bl sub_80FA42C
bl LinkRfu_SetRfuFuncToSend6600
b _0814D30C
_0814D266:
bl IsLinkTaskFinished
@@ -3316,14 +3316,14 @@ _0814D47C:
beq _0814D498
b _0814D4B8
_0814D482:
bl sub_80FA42C
bl LinkRfu_SetRfuFuncToSend6600
b _0814D4B8
_0814D488:
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0814D4BE
bl sub_800AAC0
bl Link_TryStartSend5FFF
b _0814D4B8
_0814D498:
ldr r0, _0814D4B4 @ =gReceivedRemoteLinkPlayers
asm/berry_crush_3.s
+15 -15
View File
@@ -63,7 +63,7 @@ _0814D63A:
ldr r0, _0814D65C @ =gReservedSpritePaletteCount
strb r4, [r0]
movs r0, 0x3
bl sub_815C980
bl DigitObjUtil_Init
b _0814D878
.align 2, 0
_0814D658: .4byte 0x01000200
@@ -338,7 +338,7 @@ _0814D8B4:
.4byte _0814D9A2
.4byte _0814D9B2
_0814D8D4:
bl sub_80FA42C
bl LinkRfu_SetRfuFuncToSend6600
b _0814D9BA
_0814D8DA:
bl IsLinkTaskFinished
@@ -427,7 +427,7 @@ _0814D9A2:
bl DestroyWirelessStatusIndicatorSprite
adds r0, r5, 0
bl sub_814EF10
bl sub_815C9F4
bl DigitObjUtil_Teardown
b _0814D9BA
_0814D9B2:
movs r0, 0
@@ -2578,15 +2578,15 @@ sub_814EAD4: @ 814EAD4
movs r0, 0x4
ldrsh r1, [r4, r0]
movs r0, 0
bl sub_815CD70
bl DigitObjUtil_PrintNumOn
movs r0, 0x6
ldrsh r1, [r4, r0]
movs r0, 0x1
bl sub_815CD70
bl DigitObjUtil_PrintNumOn
movs r0, 0x8
ldrsh r1, [r4, r0]
movs r0, 0x2
bl sub_815CD70
bl DigitObjUtil_PrintNumOn
pop {r4}
pop {r0}
bx r0
@@ -2608,13 +2608,13 @@ sub_814EB04: @ 814EB04
strb r0, [r1]
movs r0, 0x2
movs r1, 0x1
bl sub_815D1A8
bl DigitObjUtil_HideOrShow
movs r0, 0x1
movs r1, 0x1
bl sub_815D1A8
bl DigitObjUtil_HideOrShow
movs r0, 0
movs r1, 0x1
bl sub_815D1A8
bl DigitObjUtil_HideOrShow
pop {r0}
bx r0
thumb_func_end sub_814EB04
@@ -3060,17 +3060,17 @@ _0814EE3E:
movs r0, 0
movs r1, 0
adds r2, r4, 0
bl sub_815CA40
bl DigitObjUtil_CreatePrinter
adds r2, r4, 0
adds r2, 0x10
movs r0, 0x1
movs r1, 0
bl sub_815CA40
bl DigitObjUtil_CreatePrinter
adds r4, 0x20
movs r0, 0x2
movs r1, 0
adds r2, r4, 0
bl sub_815CA40
bl DigitObjUtil_CreatePrinter
ldrh r0, [r6, 0x12]
cmp r0, 0x1
bne _0814EED8
@@ -3130,11 +3130,11 @@ _0814EF46:
cmp r4, 0x1
bls _0814EF46
movs r0, 0x2
bl sub_815D108
bl DigitObjUtil_DeletePrinter
movs r0, 0x1
bl sub_815D108
bl DigitObjUtil_DeletePrinter
movs r0, 0
bl sub_815D108
bl DigitObjUtil_DeletePrinter
movs r4, 0
movs r1, 0xC2
lsls r1, 1
asm/cable_club.s
+18 -16
View File
@@ -751,7 +751,7 @@ sub_8080CDC: @ 8080CDC
lsrs r0, 16
cmp r0, 0x1
bhi _08080D3C
bl sub_800AAC0
bl Link_TryStartSend5FFF
bl HideFieldMessageBox
ldr r0, _08080D38 @ =sub_8080F78
b _08080D72
@@ -845,14 +845,14 @@ sub_8080DC0: @ 8080DC0
bl sub_8080D8C
cmp r0, 0x1
beq _08080DFE
bl sub_800AAC0
bl Link_TryStartSend5FFF
b _08080E02
.align 2, 0
_08080DE8: .4byte gSpecialVar_Result
_08080DEC:
cmp r0, 0x3
bne _08080DF6
bl sub_800AAC0
bl Link_TryStartSend5FFF
b _08080E02
_08080DF6:
cmp r0, 0x7
@@ -1010,7 +1010,7 @@ _08080F48: .4byte gLinkType
_08080F4C: .4byte 0x00004411
_08080F50: .4byte gTasks
_08080F54:
bl sub_800AAC0
bl Link_TryStartSend5FFF
ldr r0, _08080F70 @ =gTasks
mov r2, r8
adds r1, r2, r7
@@ -1564,7 +1564,7 @@ _0808138C:
ble _0808143A
b _080813AA
_0808139C:
bl sub_800AAC0
bl Link_TryStartSend5FFF
b _080813AA
_080813A2:
ldr r0, _080813B4 @ =gReceivedRemoteLinkPlayers
@@ -1756,7 +1756,7 @@ _08081510:
ldr r1, [r1]
str r1, [r0]
adds r0, r5, 0
bl sub_800B284
bl IntlConvertLinkPlayerName
lsls r0, r4, 24
lsrs r0, 24
bl ResetBlockReceivedFlag
@@ -1785,7 +1785,7 @@ _0808154C:
strh r0, [r6]
b _0808160A
_08081560:
bl sub_800AB9C
bl PrepareSendLinkCmd2FFE_or_RfuCmd6600
movs r0, 0x6
strh r0, [r6]
b _0808160A
@@ -1895,7 +1895,7 @@ sub_8081624: @ 8081624
.align 2, 0
_0808163C: .4byte gMain
_08081640:
bl sub_800AAC0
bl Link_TryStartSend5FFF
ldrb r0, [r4]
adds r0, 0x1
strb r0, [r4]
@@ -1942,9 +1942,9 @@ sub_8081668: @ 8081668
beq _0808170A
ldr r0, _080816C4 @ =gBattleOutcome
ldrb r0, [r0]
cmp r0, 0x1
cmp r0, 0x1 @ B_OUTCOME_WON
beq _080816C8
cmp r0, 0x2
cmp r0, 0x2 @ B_OUTCOME_LOST
beq _080816EC
b _0808170A
.align 2, 0
@@ -1955,6 +1955,7 @@ _080816BC: .4byte gLocalLinkPlayerId
_080816C0: .4byte gWirelessCommType
_080816C4: .4byte gBattleOutcome
_080816C8:
@ MEvent_RecordIdOfWonderCardSenderByEventType(0, gLinkPlayers[GetMultiplayerId() ^ 1].trainerId);
ldr r4, _080816E8 @ =gLinkPlayers
bl GetMultiplayerId
eors r0, r5
@@ -1967,11 +1968,12 @@ _080816C8:
adds r1, r4
ldr r1, [r1]
movs r0, 0
bl sub_8144714
bl MEvent_RecordIdOfWonderCardSenderByEventType
b _0808170A
.align 2, 0
_080816E8: .4byte gLinkPlayers
_080816EC:
@ MEvent_RecordIdOfWonderCardSenderByEventType(1, gLinkPlayers[GetMultiplayerId() ^ 1].trainerId);
ldr r4, _08081718 @ =gLinkPlayers
bl GetMultiplayerId
eors r0, r5
@@ -1984,7 +1986,7 @@ _080816EC:
adds r1, r4
ldr r1, [r1]
movs r0, 0x1
bl sub_8144714
bl MEvent_RecordIdOfWonderCardSenderByEventType
_0808170A:
bl InUnionRoom
cmp r0, 0x1
@@ -2198,7 +2200,7 @@ _080818A8:
strb r0, [r1]
strb r0, [r1, 0x1]
bl m4aMPlayAllStop
bl sub_800AAC0
bl Link_TryStartSend5FFF
_080818B8:
ldrh r0, [r4, 0x8]
adds r0, 0x1
@@ -2274,7 +2276,7 @@ _08081940:
strb r0, [r1]
strb r0, [r1, 0x1]
bl m4aMPlayAllStop
bl sub_800AB9C
bl PrepareSendLinkCmd2FFE_or_RfuCmd6600
_08081950:
ldrh r0, [r4]
adds r0, 0x1
@@ -2287,7 +2289,7 @@ _0808195C:
lsls r0, 24
cmp r0, 0
beq _08081970
bl sub_8117118
bl UnionRoom_CreateTask_CallBC2ReturnFromLinkTrade
adds r0, r5, 0
bl DestroyTask
_08081970:
@@ -2507,7 +2509,7 @@ sub_8081B08: @ 8081B08
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
bl sub_800AAC0
bl Link_TryStartSend5FFF
ldr r1, _08081B28 @ =gTasks
lsls r0, r4, 2
adds r0, r4
asm/dodrio_berry_picking.s
+8 -8
View File
@@ -5,8 +5,8 @@
.text
thumb_func_start sub_81507FC
sub_81507FC: @ 81507FC
thumb_func_start StartDodrioBerryPicking
StartDodrioBerryPicking: @ 81507FC
push {r4-r6,lr}
adds r5, r1, 0
lsls r0, 16
@@ -97,7 +97,7 @@ _081508D2:
pop {r4-r6}
pop {r0}
bx r0
thumb_func_end sub_81507FC
thumb_func_end StartDodrioBerryPicking
thumb_func_start sub_81508D8
sub_81508D8: @ 81508D8
@@ -382,7 +382,7 @@ _08150B08:
bl sub_8155E68
cmp r0, 0
bne _08150BFC
bl sub_80FA42C
bl LinkRfu_SetRfuFuncToSend6600
b _08150BDC
_08150B16:
bl IsLinkTaskFinished
@@ -649,7 +649,7 @@ _08150D28:
movs r1, 0x8
movs r2, 0x78
movs r3, 0x50
bl sub_815F138
bl StartMinigameCountdown
b _08150D52
_08150D3A:
bl IsLinkTaskFinished
@@ -658,11 +658,11 @@ _08150D3A:
beq _08150D74
b _08150D52
_08150D46:
bl sub_815F198
bl IsMinigameCountdownRunning
cmp r0, 0
bne _08150D74
_08150D4E:
bl sub_80FA42C
bl LinkRfu_SetRfuFuncToSend6600
_08150D52:
ldr r0, _08150D60 @ =gUnknown_203F3E0
ldr r1, [r0]
@@ -1611,7 +1611,7 @@ _081514A4:
beq _081514C0
b _081514D6
_081514AA:
bl sub_800AAC0
bl Link_TryStartSend5FFF
movs r0, 0x7
bl sub_81549D4
b _081514CC
asm/dodrio_berry_picking_2.s
+3 -3
View File
@@ -407,7 +407,7 @@ sub_815A61C: @ 815A61C
ands r5, r7
orrs r5, r4
strb r5, [r0, 0xB]
bl sub_80F9E2C
bl RfuPrepareSend0x2f00
add sp, 0x20
pop {r3-r5}
mov r8, r3
@@ -637,7 +637,7 @@ sub_815AAD8: @ 815AAD8
orrs r1, r0
str r1, [sp, 0x4]
mov r0, sp
bl sub_80F9E2C
bl RfuPrepareSend0x2f00
add sp, 0x8
pop {r0}
bx r0
@@ -692,7 +692,7 @@ sub_815AB3C: @ 815AB3C
str r1, [sp]
str r0, [sp, 0x4]
mov r0, sp
bl sub_80F9E2C
bl RfuPrepareSend0x2f00
add sp, 0x8
pop {r0}
bx r0
asm/easy_chat_2.s
+3 -3
View File
@@ -334,8 +334,8 @@ sub_80FEE24: @ 80FEE24
bx r0
thumb_func_end sub_80FEE24
thumb_func_start sub_80FEE44
sub_80FEE44: @ 80FEE44
thumb_func_start ShowEasyChatScreen
ShowEasyChatScreen: @ 80FEE44
push {lr}
ldr r0, _080FEE58 @ =gSpecialVar_0x8004
ldrh r0, [r0]
@@ -431,7 +431,7 @@ _080FEF1C: .4byte gSpecialVar_0x8005
_080FEF20: .4byte 0x00002cd0
_080FEF24: .4byte gSpecialVar_0x8004
_080FEF28: .4byte sub_80568C4
thumb_func_end sub_80FEE44
thumb_func_end ShowEasyChatScreen
thumb_func_start sub_80FEF2C
sub_80FEF2C: @ 80FEF2C
asm/event_object_80688E4.s
-1503
View File
File diff suppressed because it is too large Load Diff
asm/event_object_movement.s
+5 -5
View File
@@ -1645,7 +1645,7 @@ sprite_new: @ 805E9F8
adds r0, r5, 0
bl GetObjectEventGraphicsInfo
adds r4, r0, 0
ldr r1, _0805EB38 @ =sub_8068FA8
ldr r1, _0805EB38 @ =UpdateObjectEventSpriteSubpriorityAndVisibility
add r3, sp, 0x1C
adds r0, r5, 0
mov r2, sp
@@ -1769,7 +1769,7 @@ _0805EB24:
pop {r1}
bx r1
.align 2, 0
_0805EB38: .4byte sub_8068FA8
_0805EB38: .4byte UpdateObjectEventSpriteSubpriorityAndVisibility
_0805EB3C: .4byte 0x0000ffff
_0805EB40: .4byte gSprites
thumb_func_end sprite_new
@@ -18285,7 +18285,7 @@ sub_8066108: @ 8066108
push {r4,lr}
adds r4, r1, 0
adds r0, r4, 0
bl sub_8068E9C
bl SpriteAnimEnded
lsls r0, 24
cmp r0, 0
bne _0806611C
@@ -19637,7 +19637,7 @@ sub_8066A54: @ 8066A54
push {r4,lr}
adds r4, r1, 0
adds r0, r4, 0
bl sub_8068E9C
bl SpriteAnimEnded
lsls r0, 24
cmp r0, 0
beq _08066A70
@@ -19707,7 +19707,7 @@ sub_8066AD0: @ 8066AD0
push {r4,lr}
adds r4, r1, 0
adds r0, r4, 0
bl sub_8068E9C
bl SpriteAnimEnded
lsls r0, 24
cmp r0, 0
beq _08066AEC
asm/field_control_avatar.s
+2 -2
View File
@@ -1330,10 +1330,10 @@ _0806D2F0:
lsrs r0, 24
cmp r0, 0x1
bne _0806D308
ldr r0, _0806D304 @ =EventScript_1C549C
ldr r0, _0806D304 @ =TrainerTower_EventScript_ShowTime
b _0806D53E
.align 2, 0
_0806D304: .4byte EventScript_1C549C
_0806D304: .4byte TrainerTower_EventScript_ShowTime
_0806D308:
adds r0, r4, 0
adds r1, r5, 0
asm/field_effect_helpers.s
+13 -13
View File
@@ -951,7 +951,7 @@ _080DB4C0:
_080DB4CE:
adds r0, r5, 0
movs r1, 0
bl sub_8068EB4
bl UpdateObjectEventSpriteVisibility
ldrh r1, [r5, 0x2E]
lsls r1, 24
lsrs r1, 24
@@ -1294,7 +1294,7 @@ _080DB750:
_080DB770:
adds r0, r5, 0
movs r1, 0
bl sub_8068EB4
bl UpdateObjectEventSpriteVisibility
ldrh r1, [r5, 0x2E]
lsls r1, 24
lsrs r1, 24
@@ -1564,7 +1564,7 @@ _080DB94E:
lsls r1, 29
lsrs r1, 31
adds r0, r4, 0
bl sub_8068EB4
bl UpdateObjectEventSpriteVisibility
_080DB98E:
add sp, 0x4
pop {r3}
@@ -1781,7 +1781,7 @@ sub_80DBB18: @ 80DBB18
_080DBB2E:
adds r0, r1, 0
movs r1, 0
bl sub_8068EB4
bl UpdateObjectEventSpriteVisibility
pop {r0}
bx r0
thumb_func_end sub_80DBB18
@@ -1810,7 +1810,7 @@ sub_80DBB3C: @ 80DBB3C
lsls r1, 29
lsrs r1, 31
adds r0, r4, 0
bl sub_8068EB4
bl UpdateObjectEventSpriteVisibility
movs r1, 0x30
ldrsh r0, [r4, r1]
cmp r0, 0x38
@@ -1966,7 +1966,7 @@ _080DBC66:
strh r0, [r4, 0x22]
adds r0, r4, 0
movs r1, 0
bl sub_8068EB4
bl UpdateObjectEventSpriteVisibility
_080DBCA6:
add sp, 0x4
pop {r4}
@@ -2233,7 +2233,7 @@ _080DBE98:
strb r0, [r1]
adds r0, r4, 0
movs r1, 0
bl sub_8068EB4
bl UpdateObjectEventSpriteVisibility
ldr r1, [r5, 0x10]
ldr r0, [r4, 0x34]
cmp r1, r0
@@ -2461,7 +2461,7 @@ _080DC03C:
strb r0, [r1]
adds r0, r4, 0
movs r1, 0
bl sub_8068EB4
bl UpdateObjectEventSpriteVisibility
_080DC080:
add sp, 0x4
pop {r4,r5}
@@ -2889,7 +2889,7 @@ sub_80DC3A8: @ 80DC3A8
push {r4,lr}
adds r4, r0, 0
movs r1, 0
bl sub_8068EB4
bl UpdateObjectEventSpriteVisibility
adds r0, r4, 0
adds r0, 0x3F
ldrb r1, [r0]
@@ -3627,7 +3627,7 @@ _080DC8F6:
strb r0, [r1]
adds r0, r4, 0
movs r1, 0
bl sub_8068EB4
bl UpdateObjectEventSpriteVisibility
_080DC926:
add sp, 0x4
pop {r4-r6}
@@ -3706,7 +3706,7 @@ sub_80DC99C: @ 80DC99C
strh r1, [r4, 0x22]
adds r0, r4, 0
movs r1, 0
bl sub_8068EB4
bl UpdateObjectEventSpriteVisibility
ldrh r1, [r4, 0x3E]
ldr r0, _080DC9D8 @ =0x00001004
ands r0, r1
@@ -4163,7 +4163,7 @@ sub_80DCCE0: @ 80DCCE0
_080DCCFE:
adds r0, r4, 0
movs r1, 0
bl sub_8068EB4
bl UpdateObjectEventSpriteVisibility
ldrh r0, [r4, 0x2E]
lsls r0, 24
lsrs r0, 24
@@ -4195,7 +4195,7 @@ sub_80DCD1C: @ 80DCD1C
_080DCD3A:
adds r0, r2, 0
movs r1, 0
bl sub_8068EB4
bl UpdateObjectEventSpriteVisibility
_080DCD42:
pop {r0}
bx r0
asm/librfu_intr.s
-697
View File
@@ -1,697 +0,0 @@
.include "constants/gba_constants.inc"
.include "asm/macros.inc"
.syntax unified
.text
arm_func_start IntrSIO32
IntrSIO32: @ 81DFC50
mov r12, sp
stmdb sp!, {r11,r12,lr,pc}
ldr r3, _081DFCB0 @ =gSTWIStatus
ldr r0, [r3]
ldr r2, [r0]
sub r11, r12, 0x4
cmp r2, 0xA
bne _081DFC8C
ldr r0, [r0, 0x20]
cmp r0, 0
ldmdbeq r11, {r11,sp,lr}
bxeq lr
bl Callback_Dummy_ID
ldmdb r11, {r11,sp,lr}
bx lr
_081DFC8C:
ldrb r3, [r0, 0x14]
cmp r3, 0x1
bne _081DFCA4
bl sio32intr_clock_master
ldmdb r11, {r11,sp,lr}
bx lr
_081DFCA4:
bl sio32intr_clock_slave
ldmdb r11, {r11,sp,lr}
bx lr
.align 2, 0
_081DFCB0: .4byte gSTWIStatus
arm_func_end IntrSIO32
arm_func_start sio32intr_clock_master
sio32intr_clock_master: @ 81DFCB4
mov r12, sp
stmdb sp!, {r4-r6,r11,r12,lr,pc}
mov r0, 0x50
sub r11, r12, 0x4
bl STWI_set_timer_in_RAM
mov r4, 0x120
ldr r2, _081DFF28 @ =gSTWIStatus
add r4, r4, 0x4000000
ldr lr, [r4]
ldr r12, [r2]
ldr r3, [r12]
mov r6, r2
cmp r3, 0
bne _081DFD34
cmp lr, 0x80000000
bne _081DFDB4
ldrb r2, [r12, 0x5]
ldrb r3, [r12, 0x4]
cmp r2, r3
bhi _081DFD24
ldr r3, [r12, 0x24]
mov r1, r2
ldr r2, [r3, r1, lsl 2]
str r2, [r4]
ldrb r3, [r12, 0x5]
add r3, r3, 0x1
strb r3, [r12, 0x5]
b _081DFE10
_081DFD24:
mov r3, 0x1
str r3, [r12]
str lr, [r4]
b _081DFE10
_081DFD34:
ldr r3, [r12]
cmp r3, 0x1
bne _081DFDC4
mov r3, 0x99000000
add r3, r3, 0x660000
mov r5, 0x80000000
and r2, lr, r5, asr 15
cmp r2, r3
bne _081DFDB4
mov r3, 0
strb r3, [r12, 0x8]
ldr r1, [r6]
ldrb r0, [r1, 0x8]
ldr r2, [r1, 0x28]
str lr, [r2, r0, lsl 2]
ldrb r3, [r1, 0x8]
add r3, r3, 0x1
strb r3, [r1, 0x8]
ldr r2, [r6]
strb lr, [r2, 0x9]
ldr r3, [r6]
mov r2, lr, lsr 8
strb r2, [r3, 0x7]
ldr r1, [r6]
ldrb r2, [r1, 0x7]
ldrb r3, [r1, 0x8]
cmp r2, r3
bcc _081DFDFC
mov r3, 0x2
str r3, [r1]
str r5, [r4]
b _081DFE10
_081DFDB4:
bl STWI_stop_timer_in_RAM
mov r0, 0x82
bl STWI_set_timer_in_RAM
b _081DFF3C
_081DFDC4:
ldr r3, [r12]
cmp r3, 0x2
bne _081DFE10
ldrb r1, [r12, 0x8]
ldr r2, [r12, 0x28]
str lr, [r2, r1, lsl 2]
ldrb r3, [r12, 0x8]
add r3, r3, 0x1
strb r3, [r12, 0x8]
ldr r1, [r6]
ldrb r2, [r1, 0x7]
ldrb r3, [r1, 0x8]
cmp r2, r3
bcs _081DFE08
_081DFDFC:
mov r3, 0x3
str r3, [r1]
b _081DFE10
_081DFE08:
mov r3, 0x80000000
str r3, [r4]
_081DFE10:
mov r0, 0x1
bl handshake_wait
mov r0, r0, lsl 16
cmp r0, 0x10000
beq _081DFF3C
mov r4, 0x128
add r4, r4, 0x4000000
mov r5, 0x5000
add r3, r5, 0xB
strh r3, [r4]
mov r0, 0
bl handshake_wait
mov r0, r0, lsl 16
cmp r0, 0x10000
beq _081DFF3C
bl STWI_stop_timer_in_RAM
ldr r1, [r6]
ldr r0, [r1]
cmp r0, 0x3
bne _081DFF2C
ldrb r3, [r1, 0x9]
cmp r3, 0xA5
cmpne r3, 0xA7
beq _081DFE84
and r3, r3, 0xFF
cmp r3, 0xB5
beq _081DFE84
cmp r3, 0xB7
bne _081DFECC
_081DFE84:
mov r1, 0x120
add r1, r1, 0x4000000
mov r12, 0x128
add r12, r12, 0x4000000
ldr r0, [r6]
mov r3, 0
strb r3, [r0, 0x14]
mov r2, 0x80000000
str r2, [r1]
add r3, r3, 0x5000
add r2, r3, 0x2
strh r2, [r12]
add r3, r3, 0x82
strh r3, [r12]
ldr r2, [r6]
mov r3, 0x5
str r3, [r2]
b _081DFEFC
_081DFECC:
cmp r3, 0xEE
bne _081DFEEC
add r3, r5, 0x3
strh r3, [r4]
mov r2, 0x4
str r2, [r1]
strh r0, [r1, 0x12]
b _081DFEFC
_081DFEEC:
add r3, r5, 0x3
strh r3, [r4]
mov r2, 0x4
str r2, [r1]
_081DFEFC:
ldr r2, [r6]
mov r3, 0
strb r3, [r2, 0x2C]
ldr r0, [r6]
ldr r2, [r0, 0x18]
cmp r2, r3
beq _081DFF3C
ldrh r1, [r0, 0x12]
ldrb r0, [r0, 0x6]
bl Callback_Dummy_M
b _081DFF3C
.align 2, 0
_081DFF28: .4byte gSTWIStatus
_081DFF2C:
add r3, r5, 0x3
strh r3, [r4]
add r2, r5, 0x83
strh r2, [r4]
_081DFF3C:
ldmdb r11, {r4-r6,r11,sp,lr}
bx lr
arm_func_end sio32intr_clock_master
arm_func_start sio32intr_clock_slave
sio32intr_clock_slave: @ 81DFF44
mov r12, sp
stmdb sp!, {r4-r6,r11,r12,lr,pc}
ldr r4, _081E02F0 @ =gSTWIStatus
mov r0, 0x64
ldr r3, [r4]
mov r6, 0
strb r6, [r3, 0x10]
sub r11, r12, 0x4
bl STWI_set_timer_in_RAM
mov r0, r6
bl handshake_wait
mov r0, r0, lsl 16
cmp r0, 0x10000
mov r5, r4
beq _081E0348
mov r3, 0x128
add r3, r3, 0x4000000
mov r2, 0x5000
add r2, r2, 0xA
strh r2, [r3]
mov lr, 0x120
ldr r0, [r5]
add lr, lr, 0x4000000
ldr r12, [lr]
ldr r3, [r0]
cmp r3, 0x5
bne _081E0074
ldr r3, [r0, 0x28]
mov r4, 0x1
mov r0, 0x99000000
str r12, [r3]
add r0, r0, 0x660000
ldr r2, [r5]
mov r3, r0, lsr 16
strb r4, [r2, 0x5]
cmp r3, r12, lsr 16
bne _081E01C0
ldr r3, [r5]
mov r2, r12, lsr 8
strb r2, [r3, 0x4]
ldr r2, [r5]
strb r12, [r2, 0x6]
ldr r1, [r5]
ldrb r3, [r1, 0x4]
cmp r3, r6
bne _081E0058
ldrb r2, [r1, 0x6]
sub r3, r2, 0x27
cmp r2, 0x36
cmpne r3, 0x2
bhi _081E002C
add r3, r2, 0x80
strb r3, [r1, 0x9]
ldr r2, [r5]
ldrb r3, [r2, 0x9]
ldr r1, [r2, 0x24]
add r3, r3, r0
b _081E00DC
_081E002C:
ldr r2, [r1, 0x24]
ldr r3, _081E02F4 @ =0x996601ee
str r3, [r2]
ldr r2, [r5]
ldrb r3, [r2, 0x6]
sub r3, r3, 0x10
cmp r3, 0x2D
bhi _081E0114
ldr r3, [r2, 0x24]
str r4, [r3, 0x4]
b _081E0120
_081E0058:
mov r3, 0x80000000
str r3, [lr]
strb r4, [r1, 0x5]
ldr r2, [r5]
add r3, r3, 0x80000006
str r3, [r2]
b _081E01D0
_081E0074:
ldr r3, [r0]
cmp r3, 0x6
bne _081E0174
ldrb r1, [r0, 0x5]
ldr r2, [r0, 0x28]
str r12, [r2, r1, lsl 2]
ldrb r3, [r0, 0x5]
add r3, r3, 0x1
strb r3, [r0, 0x5]
ldr r1, [r5]
ldrb r2, [r1, 0x4]
ldrb r3, [r1, 0x5]
cmp r2, r3
bcs _081E0168
ldrb r2, [r1, 0x6]
sub r3, r2, 0x28
cmp r2, 0x36
cmpne r3, 0x1
bhi _081E00EC
add r3, r2, 0x80
strb r3, [r1, 0x9]
ldr r2, [r5]
ldrb r3, [r2, 0x9]
ldr r1, [r2, 0x24]
orr r3, r3, 0x99000000
orr r3, r3, 0x660000
_081E00DC:
str r3, [r1]
ldr r2, [r5]
strb r6, [r2, 0x7]
b _081E0138
_081E00EC:
ldr r2, [r1, 0x24]
ldr r3, _081E02F4 @ =0x996601ee
str r3, [r2]
ldr r2, [r5]
ldrb r3, [r2, 0x6]
sub r3, r3, 0x10
cmp r3, 0x2D
ldrls r2, [r2, 0x24]
movls r3, 0x1
bls _081E011C
_081E0114:
ldr r2, [r2, 0x24]
mov r3, 0x2
_081E011C:
str r3, [r2, 0x4]
_081E0120:
ldr r2, [r5]
mov r3, 0x1
strb r3, [r2, 0x7]
ldr r1, [r5]
add r3, r3, 0x2
strh r3, [r1, 0x12]
_081E0138:
ldr r0, [r5]
ldr r2, [r0, 0x24]
mov r3, 0x120
ldr r1, [r2]
add r3, r3, 0x4000000
str r1, [r3]
mov r2, 0x1
strb r2, [r0, 0x8]
ldr r1, [r5]
mov r3, 0x7
str r3, [r1]
b _081E01D0
_081E0168:
mov r3, 0x80000000
str r3, [lr]
b _081E01D0
_081E0174:
ldr r3, [r0]
cmp r3, 0x7
bne _081E01D0
cmp r12, 0x80000000
bne _081E01C0
ldrb r2, [r0, 0x7]
ldrb r3, [r0, 0x8]
cmp r2, r3
movcc r3, 0x8
strcc r3, [r0]
bcc _081E01D0
ldrb r1, [r0, 0x8]
ldr r3, [r0, 0x24]
ldr r2, [r3, r1, lsl 2]
str r2, [lr]
ldrb r3, [r0, 0x8]
add r3, r3, 0x1
strb r3, [r0, 0x8]
b _081E01D0
_081E01C0:
bl STWI_stop_timer_in_RAM
mov r0, 0x64
bl STWI_set_timer_in_RAM
b _081E0348
_081E01D0:
mov r0, 0x1
bl handshake_wait
mov r0, r0, lsl 16
cmp r0, 0x10000
beq _081E0348
mov r6, r5
ldr r3, [r6]
ldr r2, [r3]
cmp r2, 0x8
bne _081E0298
mov r4, 0x128
add r4, r4, 0x4000000
mov r3, 0x5000
add r3, r3, 0x2
strh r3, [r4]
bl STWI_stop_timer_in_RAM
ldr r0, [r6]
ldrh r3, [r0, 0x12]
cmp r3, 0x3
bne _081E0244
bl STWI_init_slave
ldr r3, [r6]
ldr r1, [r3, 0x1C]
cmp r1, 0
beq _081E0348
mov r0, 0x1EC
add r0, r0, 0x2
bl Callback_Dummy_S
b _081E0348
_081E0244:
mov r3, 0x120
add r3, r3, 0x4000000
mov r1, 0
str r1, [r3]
mov r2, 0x5000
strh r1, [r4]
add r2, r2, 0x3
strh r2, [r4]
mov r3, 0x1
strb r3, [r0, 0x14]
ldr r0, [r5]
ldr r2, [r0, 0x1C]
str r1, [r0]
cmp r2, r1
beq _081E0348
ldrb r3, [r0, 0x4]
ldrb r0, [r0, 0x6]
mov r1, r2
orr r0, r0, r3, lsl 8
bl Callback_Dummy_S
b _081E0348
_081E0298:
mov r3, 0x208
add r3, r3, 0x4000000
mov r2, 0
strh r2, [r3]
mov r1, 0x100
add r2, r1, 0x4000002
ldrh r3, [r2]
tst r3, 0x80
beq _081E031C
ldrh r3, [r2]
tst r3, 0x3
bne _081E02F8
mov r2, 0xFF00
add r1, r1, 0x4000000
ldrh r3, [r1]
add r2, r2, 0x9B
cmp r3, r2
bls _081E031C
_081E02E0:
ldrh r3, [r1]
cmp r3, r2
bhi _081E02E0
b _081E031C
.align 2, 0
_081E02F0: .4byte gSTWIStatus
_081E02F4: .4byte 0x996601ee
_081E02F8:
mov r2, 0xFF00
add r1, r1, 0x4000000
ldrh r3, [r1]
add r2, r2, 0xFE
cmp r3, r2
bls _081E031C
_081E0310:
ldrh r3, [r1]
cmp r3, r2
bhi _081E0310
_081E031C:
mov r1, 0x128
add r1, r1, 0x4000000
mov r0, 0x208
add r0, r0, 0x4000000
mov r3, 0x5000
add r2, r3, 0x2
strh r2, [r1]
add r3, r3, 0x82
strh r3, [r1]
mov r2, 0x1
strh r2, [r0]
_081E0348:
ldmdb r11, {r4-r6,r11,sp,lr}
bx lr
arm_func_end sio32intr_clock_slave
arm_func_start handshake_wait
handshake_wait: @ 81E0350
mov r12, sp
stmdb sp!, {r11,r12,lr,pc}
mov r1, 0x128
add r1, r1, 0x4000000
mov r0, r0, lsl 16
ldr r2, _081E03B4 @ =gSTWIStatus
sub r11, r12, 0x4
mov lr, r0, lsr 14
ldr r12, [r2]
_081E0374:
ldrb r3, [r12, 0x10]
and r0, r3, 0xFF
cmp r0, 0x1
beq _081E03A0
ldrh r3, [r1]
and r3, r3, 0x4
cmp r3, lr
bne _081E0374
mov r0, 0
ldmdb r11, {r11,sp,lr}
bx lr
_081E03A0:
ldr r2, [r2]
mov r3, 0
strb r3, [r2, 0x10]
ldmdb r11, {r11,sp,lr}
bx lr
.align 2, 0
_081E03B4: .4byte gSTWIStatus
arm_func_end handshake_wait
arm_func_start STWI_set_timer_in_RAM
STWI_set_timer_in_RAM: @ 81E03B8
mov r12, sp
stmdb sp!, {r4,r5,r11,r12,lr,pc}
mov r1, 0x208
add r1, r1, 0x4000000
mov r3, 0
sub r11, r12, 0x4
ldr r12, _081E0470 @ =gSTWIStatus
and lr, r0, 0xFF
ldr r2, [r12]
cmp lr, 0x50
ldrb r0, [r2, 0xA]
mov r4, r12
mov r2, lr
strh r3, [r1]
mov r0, r0, lsl 2
add r3, r3, 0x100
add r1, r3, 0x4000000
add r3, r3, 0x4000002
add r5, r0, r3
beq _081E0440
bgt _081E0418
cmp lr, 0x32
beq _081E042C
b _081E048C
_081E0418:
cmp r2, 0x64
beq _081E0458
cmp r2, 0x82
beq _081E0474
b _081E048C
_081E042C:
mvn r3, 0x334
strh r3, [r0, r1]
ldr r2, [r4]
mov r3, 0x1
b _081E0488
_081E0440:
mov r3, 0xAE000000
mov r3, r3, asr 20
strh r3, [r0, r1]
ldr r2, [r4]
mov r3, 0x2
b _081E0488
_081E0458:
mvn r3, 0x660
sub r3, r3, 0x9
strh r3, [r0, r1]
ldr r2, [r4]
mov r3, 0x3
b _081E0488
.align 2, 0
_081E0470: .4byte gSTWIStatus
_081E0474:
mvn r3, 0x850
sub r3, r3, 0x2
strh r3, [r0, r1]
ldr r2, [r4]
mov r3, 0x4
_081E0488:
str r3, [r2, 0xC]
_081E048C:
mov r12, 0x200
add r12, r12, 0x4000002
mov r3, 0xC3
strh r3, [r5]
mov r1, 0x208
ldr r2, [r4]
add r1, r1, 0x4000000
ldrb r0, [r2, 0xA]
sub r3, r3, 0xBB
mov r3, r3, lsl r0
strh r3, [r12]
mov r2, 0x1
strh r2, [r1]
ldmdb r11, {r4,r5,r11,sp,lr}
bx lr
arm_func_end STWI_set_timer_in_RAM
arm_func_start STWI_stop_timer_in_RAM
STWI_stop_timer_in_RAM: @ 81E04C8
mov r12, sp
stmdb sp!, {r11,r12,lr,pc}
mov r1, 0x100
ldr lr, _081E0514 @ =gSTWIStatus
add r0, r1, 0x4000000
ldr r2, [lr]
sub r11, r12, 0x4
ldrb r3, [r2, 0xA]
mov r12, 0
str r12, [r2, 0xC]
mov r3, r3, lsl 2
strh r12, [r3, r0]
ldr r2, [lr]
ldrb r3, [r2, 0xA]
add r1, r1, 0x4000002
mov r3, r3, lsl 2
strh r12, [r3, r1]
ldmdb r11, {r11,sp,lr}
bx lr
.align 2, 0
_081E0514: .4byte gSTWIStatus
arm_func_end STWI_stop_timer_in_RAM
arm_func_start STWI_init_slave
STWI_init_slave: @ 81E0518
mov r12, sp
stmdb sp!, {r11,r12,lr,pc}
ldr r0, _081E05A0 @ =gSTWIStatus
ldr r2, [r0]
mov r3, 0x5
str r3, [r2]
mov r1, 0
strb r1, [r2, 0x14]
ldr r3, [r0]
strb r1, [r3, 0x4]
ldr r2, [r0]
strb r1, [r2, 0x5]
ldr r3, [r0]
strb r1, [r3, 0x6]
ldr r2, [r0]
strb r1, [r2, 0x7]
ldr r3, [r0]
strb r1, [r3, 0x8]
ldr r2, [r0]
strb r1, [r2, 0x9]
ldr r3, [r0]
str r1, [r3, 0xC]
sub r11, r12, 0x4
strb r1, [r3, 0x10]
mov r2, 0x128
ldr r12, [r0]
add r2, r2, 0x4000000
strh r1, [r12, 0x12]
mov r3, 0x5000
strb r1, [r12, 0x15]
add r3, r3, 0x82
strh r3, [r2]
ldmdb r11, {r11,sp,lr}
bx lr
.align 2, 0
_081E05A0: .4byte gSTWIStatus
arm_func_end STWI_init_slave
arm_func_start Callback_Dummy_M
Callback_Dummy_M: @ 81E05A4
bx r2
arm_func_end Callback_Dummy_M
arm_func_start Callback_Dummy_S
Callback_Dummy_S: @ 81E05A8
bx r1
arm_func_end Callback_Dummy_S
arm_func_start Callback_Dummy_ID
Callback_Dummy_ID: @ 81E05AC
bx r0
arm_func_end Callback_Dummy_ID
asm/macros.inc
+1
View File
@@ -5,6 +5,7 @@
.include "asm/macros/ec.inc"
.include "asm/macros/map.inc"
.include "asm/macros/m4a.inc"
.include "asm/macros/trainer_tower.inc"
.macro region_map_location x, y, width, height, name
.byte \x
asm/macros/trainer_tower.inc
+133
View File
@@ -0,0 +1,133 @@
@ Sets NPC gfx and the floor layout depending on current challenge and floor
.macro ttower_initfloor
setvar VAR_0x8004, TRAINER_TOWER_FUNC_INIT_FLOOR
special CallTrainerTowerFunc
.endm
@ Buffers the opponents battle speech to gStringVar4. speech is any TRAINER_TOWER_TEXT_*.
.macro ttower_getspeech speech:req, trainer=0xFF
setvar VAR_0x8004, TRAINER_TOWER_FUNC_GET_SPEECH
setvar VAR_0x8005, \speech
.if \trainer >= VARS_START && \trainer != 0xFF
copyvar VAR_0x8006, \trainer
.elseif \trainer != 0xFF
setvar VAR_0x8006, \trainer
.endif
special CallTrainerTowerFunc
.endm
@ Starts a trainer tower battle. VAR_0x8005 is unused
.macro ttower_dobattle
setvar VAR_0x8004, TRAINER_TOWER_FUNC_DO_BATTLE
setvar VAR_0x8005, 0
special CallTrainerTowerFunc
.endm
@ Returns the current challenge type (CHALLENGE_TYPE_*). Mixed challenges use different types for each floor. If VAR_0x8005 is != FALSE, does nothing
.macro ttower_getchallengetype
setvar VAR_0x8004, TRAINER_TOWER_FUNC_GET_CHALLENGE_TYPE
setvar VAR_0x8005, FALSE
special CallTrainerTowerFunc
.endm
@ Adds 1 to the number of floors cleared (all trainers on floor defeated)
.macro ttower_clearedfloor
setvar VAR_0x8004, TRAINER_TOWER_FUNC_CLEARED_FLOOR
special CallTrainerTowerFunc
.endm
@ TRUE if the trainers on this floor were already beaten, FALSE otherwise
.macro ttower_isfloorcleared
setvar VAR_0x8004, TRAINER_TOWER_FUNC_GET_FLOOR_CLEARED
special CallTrainerTowerFunc
.endm
@ Initializes the Trainer Tower challenge and starts the timer
.macro ttower_startchallenge
setvar VAR_0x8004, TRAINER_TOWER_FUNC_START_CHALLENGE
special CallTrainerTowerFunc
.endm
@ 0 if not spoken to yet, 1 if spoken to but not received prize, 2 if received prize
.macro ttower_getownerstate
setvar VAR_0x8004, TRAINER_TOWER_FUNC_GET_OWNER_STATE
special CallTrainerTowerFunc
.endm
@ Tries to give prize. 0 if given successfully, 1 if no room for prize, 2 if giving prize should be skipped
.macro ttower_giveprize
setvar VAR_0x8004, TRAINER_TOWER_FUNC_GIVE_PRIZE
special CallTrainerTowerFunc
.endm
@ Checks the final challenge time. 0 if new record, 1 if not, 2 if time has already been checked
.macro ttower_checkfinaltime
setvar VAR_0x8004, TRAINER_TOWER_FUNC_CHECK_FINAL_TIME
special CallTrainerTowerFunc
.endm
@ Resumes the challenge timer (or starts, if the timer is 0)
.macro ttower_resumetimer
setvar VAR_0x8004, TRAINER_TOWER_FUNC_RESUME_TIMER
special CallTrainerTowerFunc
.endm
@ Sets that the player lost the challenge
.macro ttower_setlost
setvar VAR_0x8004, TRAINER_TOWER_FUNC_SET_LOST
special CallTrainerTowerFunc
.endm
@ Returns the status of the current Trainer Tower challenge (CHALLENGE_STATUS_*)
.macro ttower_getchallengestatus
setvar VAR_0x8004, TRAINER_TOWER_FUNC_GET_CHALLENGE_STATUS
special CallTrainerTowerFunc
.endm
@ Buffers the current challenge time (min in gStringVar1, sec in gStringVar2, fraction sec in gStringVar3)
.macro ttower_gettime
setvar VAR_0x8004, TRAINER_TOWER_FUNC_GET_TIME
special CallTrainerTowerFunc
.endm
@ Unused. Displays Trainer Tower results. Handled by Special_BattleRecords instead
.macro ttower_showresults
setvar VAR_0x8004, TRAINER_TOWER_FUNC_SHOW_RESULTS
special CallTrainerTowerFunc
.endm
@ Unused. See above
.macro ttower_closeresults
setvar VAR_0x8004, TRAINER_TOWER_FUNC_CLOSE_RESULTS
special CallTrainerTowerFunc
.endm
@ Returns the eligibility of the players party for a double battle (using GetMonsStateToDoubles)
.macro ttower_checkdoubles
setvar VAR_0x8004, TRAINER_TOWER_FUNC_CHECK_DOUBLES
special CallTrainerTowerFunc
.endm
@ For the unused E-Reader challenges, gets the number of floors used. Otherwise returns FALSE (all floors used)
.macro ttower_getnumfloors
setvar VAR_0x8004, TRAINER_TOWER_FUNC_GET_NUM_FLOORS
special CallTrainerTowerFunc
.endm
@ Dummied, always returns FALSE
.macro ttower_shouldexit
setvar VAR_0x8004, TRAINER_TOWER_FUNC_SHOULD_WARP_TO_COUNTER
special CallTrainerTowerFunc
.endm
@ Plays the encounter music for the trainer number in VAR_TEMP_1
.macro ttower_encountermusic
setvar VAR_0x8004, TRAINER_TOWER_FUNC_ENCOUNTER_MUSIC
special CallTrainerTowerFunc
.endm
@ TRUE if the player reached the Battle Tower owner, FALSE otherwise
.macro ttower_getbeatchallenge
setvar VAR_0x8004, TRAINER_TOWER_FUNC_GET_BEAT_CHALLENGE
special CallTrainerTowerFunc
.endm
asm/overworld.s
+70 -70
View File
@@ -1718,7 +1718,7 @@ sub_8055864: @ 8055864
bl sav1_reset_battle_music_maybe
bl mapheader_run_script_with_tag_x3
bl TryRegenerateRenewableHiddenItems
bl not_trainer_hill_battle_pyramid
bl InitMap
ldr r4, _0805591C @ =gMapHeader
ldr r0, [r4]
bl copy_map_tileset2_to_vram_2
@@ -1798,7 +1798,7 @@ _08055974:
bl UpdateLocationHistoryForRoamer
bl RoamerMoveToOtherLocationSet
bl sub_8110920
bl not_trainer_hill_battle_pyramid
bl InitMap
pop {r4}
pop {r0}
bx r0
@@ -1823,7 +1823,7 @@ sub_80559A8: @ 80559A8
bl sub_8110920
bl sub_8111708
bl set_current_map_header_from_sav1
bl not_trainer_hill_battle_pyramid
bl InitMap
pop {r0}
bx r0
.align 2, 0
@@ -2597,7 +2597,7 @@ GetMapMusicFadeoutSpeed: @ 8055F68
push {lr}
bl warp1_get_mapheader
ldrb r0, [r0, 0x17]
bl is_light_level_8_or_9
bl IsMapTypeIndoors
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2981,8 +2981,8 @@ _08056218:
bx r1
thumb_func_end Overworld_MapTypeAllowsTeleportAndFly
thumb_func_start is_light_level_8_or_9
is_light_level_8_or_9: @ 805621C
thumb_func_start IsMapTypeIndoors
IsMapTypeIndoors: @ 805621C
push {lr}
lsls r0, 24
movs r1, 0xF8
@@ -2998,10 +2998,10 @@ _08056230:
_08056232:
pop {r1}
bx r1
thumb_func_end is_light_level_8_or_9
thumb_func_end IsMapTypeIndoors
thumb_func_start sav1_saved_warp2_map_get_name
sav1_saved_warp2_map_get_name: @ 8056238
thumb_func_start GetSavedWarpRegionMapSectionId
GetSavedWarpRegionMapSectionId: @ 8056238
push {lr}
ldr r0, _0805625C @ =gSaveBlock1Ptr
ldr r1, [r0]
@@ -3020,7 +3020,7 @@ sav1_saved_warp2_map_get_name: @ 8056238
bx r1
.align 2, 0
_0805625C: .4byte gSaveBlock1Ptr
thumb_func_end sav1_saved_warp2_map_get_name
thumb_func_end GetSavedWarpRegionMapSectionId
thumb_func_start GetCurrentRegionMapSectionId
GetCurrentRegionMapSectionId: @ 8056260
@@ -3044,8 +3044,8 @@ GetCurrentRegionMapSectionId: @ 8056260
_08056284: .4byte gSaveBlock1Ptr
thumb_func_end GetCurrentRegionMapSectionId
thumb_func_start sav1_map_get_battletype
sav1_map_get_battletype: @ 8056288
thumb_func_start GetCurrentMapBattleScene
GetCurrentMapBattleScene: @ 8056288
push {lr}
ldr r0, _080562AC @ =gSaveBlock1Ptr
ldr r1, [r0]
@@ -3064,10 +3064,10 @@ sav1_map_get_battletype: @ 8056288
bx r1
.align 2, 0
_080562AC: .4byte gSaveBlock1Ptr
thumb_func_end sav1_map_get_battletype
thumb_func_end GetCurrentMapBattleScene
thumb_func_start sub_80562B0
sub_80562B0: @ 80562B0
thumb_func_start InitOverworldBgs
InitOverworldBgs: @ 80562B0
push {r4-r6,lr}
mov r6, r8
push {r6}
@@ -3130,7 +3130,7 @@ _08056344: .4byte gUnknown_826D320
_08056348: .4byte gUnknown_3005018
_0805634C: .4byte gUnknown_3005014
_08056350: .4byte gUnknown_300501C
thumb_func_end sub_80562B0
thumb_func_end InitOverworldBgs
thumb_func_start sub_8056354
sub_8056354: @ 8056354
@@ -3430,14 +3430,14 @@ _080565D4:
_080565DC: .4byte gPaletteFade
thumb_func_end sub_80565B4
thumb_func_start sub_80565E0
sub_80565E0: @ 80565E0
thumb_func_start SetMainCallback1
SetMainCallback1: @ 80565E0
ldr r1, _080565E8 @ =gMain
str r0, [r1]
bx lr
.align 2, 0
_080565E8: .4byte gMain
thumb_func_end sub_80565E0
thumb_func_end SetMainCallback1
thumb_func_start map_post_load_hook_exec
map_post_load_hook_exec: @ 80565EC
@@ -3490,7 +3490,7 @@ _08056640: .4byte gFieldCallback
thumb_func_start CB2_NewGame
CB2_NewGame: @ 8056644
push {lr}
bl sub_80569BC
bl FieldClearVBlankHBlankCallbacks
bl StopMapMusic
bl sub_8056420
bl NewGameInitData
@@ -3508,7 +3508,7 @@ CB2_NewGame: @ 8056644
bl do_load_map_stuff_loop
bl SetFieldVBlankCallback
ldr r0, _0805669C @ =sub_8056534
bl sub_80565E0
bl SetMainCallback1
ldr r0, _080566A0 @ =sub_80565B4
bl SetMainCallback2
pop {r0}
@@ -3537,7 +3537,7 @@ CB2_WhiteOut: @ 80566A4
lsrs r0, 24
cmp r0, 0x77
bls _08056702
bl sub_80569BC
bl FieldClearVBlankHBlankCallbacks
bl StopMapMusic
bl sub_8056420
bl sub_8054BC8
@@ -3556,7 +3556,7 @@ CB2_WhiteOut: @ 80566A4
bl sub_8112364
bl SetFieldVBlankCallback
ldr r0, _08056714 @ =sub_8056534
bl sub_80565E0
bl SetMainCallback1
ldr r0, _08056718 @ =sub_80565B4
bl SetMainCallback2
_08056702:
@@ -3574,11 +3574,11 @@ _08056718: .4byte sub_80565B4
thumb_func_start CB2_LoadMap
CB2_LoadMap: @ 805671C
push {lr}
bl sub_80569BC
bl FieldClearVBlankHBlankCallbacks
bl ScriptContext1_Init
bl ScriptContext2_Disable
movs r0, 0
bl sub_80565E0
bl SetMainCallback1
ldr r0, _08056740 @ =sub_80C9BFC
bl SetMainCallback2
ldr r1, _08056744 @ =gMain
@@ -3609,7 +3609,7 @@ _08056768: .4byte gMain + 0x438
_0805676C:
bl SetFieldVBlankCallback
ldr r0, _08056780 @ =sub_8056534
bl sub_80565E0
bl SetMainCallback1
ldr r0, _08056784 @ =sub_80565B4
bl SetMainCallback2
_0805677C:
@@ -3620,12 +3620,12 @@ _08056780: .4byte sub_8056534
_08056784: .4byte sub_80565B4
thumb_func_end sub_805674C
thumb_func_start sub_8056788
sub_8056788: @ 8056788
thumb_func_start CB2_ReturnToFieldCableClub
CB2_ReturnToFieldCableClub: @ 8056788
push {lr}
bl sub_80569BC
bl FieldClearVBlankHBlankCallbacks
ldr r0, _080567A0 @ =gFieldCallback
ldr r1, _080567A4 @ =sub_807DE58
ldr r1, _080567A4 @ =FieldCB_ReturnToFieldWirelessLink
str r1, [r0]
ldr r0, _080567A8 @ =c2_80567AC
bl SetMainCallback2
@@ -3633,20 +3633,20 @@ sub_8056788: @ 8056788
bx r0
.align 2, 0
_080567A0: .4byte gFieldCallback
_080567A4: .4byte sub_807DE58
_080567A4: .4byte FieldCB_ReturnToFieldWirelessLink
_080567A8: .4byte c2_80567AC
thumb_func_end sub_8056788
thumb_func_end CB2_ReturnToFieldCableClub
thumb_func_start c2_80567AC
c2_80567AC: @ 80567AC
push {lr}
ldr r0, _080567D0 @ =gMain + 0x438
bl sub_8056A5C
bl map_loading_iteration_3
cmp r0, 0
beq _080567CC
bl SetFieldVBlankCallback
ldr r0, _080567D4 @ =c1_link_related
bl sub_80565E0
bl SetMainCallback1
bl sub_80578D8
ldr r0, _080567D8 @ =sub_80565B4
bl SetMainCallback2
@@ -3671,7 +3671,7 @@ CB2_ReturnToField: @ 80567DC
.align 2, 0
_080567F0: .4byte c2_exit_to_overworld_2_link
_080567F4:
bl sub_80569BC
bl FieldClearVBlankHBlankCallbacks
ldr r0, _08056804 @ =c2_exit_to_overworld_2_local
bl SetMainCallback2
_080567FE:
@@ -3722,23 +3722,23 @@ _08056850: .4byte sub_80565B4
thumb_func_start c2_8056854
c2_8056854: @ 8056854
push {lr}
bl sub_80569BC
bl FieldClearVBlankHBlankCallbacks
bl StopMapMusic
ldr r0, _08056878 @ =c1_link_related
bl sub_80565E0
bl SetMainCallback1
bl sub_80578D8
ldr r0, _0805687C @ =gWirelessCommType
ldrb r0, [r0]
cmp r0, 0
beq _08056888
ldr r1, _08056880 @ =gFieldCallback
ldr r0, _08056884 @ =sub_807DE58
ldr r0, _08056884 @ =FieldCB_ReturnToFieldWirelessLink
b _0805688C
.align 2, 0
_08056878: .4byte c1_link_related
_0805687C: .4byte gWirelessCommType
_08056880: .4byte gFieldCallback
_08056884: .4byte sub_807DE58
_08056884: .4byte FieldCB_ReturnToFieldWirelessLink
_08056888:
ldr r1, _080568A0 @ =gFieldCallback
ldr r0, _080568A4 @ =sub_807DDD0
@@ -3757,7 +3757,7 @@ _080568A4: .4byte sub_807DDD0
thumb_func_start CB2_ReturnToFieldWithOpenMenu
CB2_ReturnToFieldWithOpenMenu: @ 80568A8
push {lr}
bl sub_80569BC
bl FieldClearVBlankHBlankCallbacks
ldr r1, _080568BC @ =gFieldCallback2
ldr r0, _080568C0 @ =FieldCB2_ReturnToStartMenuInit
str r0, [r1]
@@ -3772,7 +3772,7 @@ _080568C0: .4byte FieldCB2_ReturnToStartMenuInit
thumb_func_start sub_80568C4
sub_80568C4: @ 80568C4
push {lr}
bl sub_80569BC
bl FieldClearVBlankHBlankCallbacks
ldr r1, _080568D8 @ =gFieldCallback
ldr r0, _080568DC @ =sub_807DD44
str r0, [r1]
@@ -3787,7 +3787,7 @@ _080568DC: .4byte sub_807DD44
thumb_func_start CB2_ReturnToFieldContinueScriptPlayMapMusic
CB2_ReturnToFieldContinueScriptPlayMapMusic: @ 80568E0
push {lr}
bl sub_80569BC
bl FieldClearVBlankHBlankCallbacks
ldr r1, _080568F4 @ =gFieldCallback
ldr r0, _080568F8 @ =FieldCallback_ReturnToEventScript2
str r0, [r1]
@@ -3802,7 +3802,7 @@ _080568F8: .4byte FieldCallback_ReturnToEventScript2
thumb_func_start CB2_Overworld
CB2_Overworld: @ 80568FC
push {lr}
bl sub_80569BC
bl FieldClearVBlankHBlankCallbacks
ldr r1, _08056910 @ =gFieldCallback
ldr r0, _08056914 @ =sub_807DF7C
str r0, [r1]
@@ -3836,14 +3836,14 @@ _08056934: .4byte gMapHeader
thumb_func_start CB2_ContinueSavedGame
CB2_ContinueSavedGame: @ 8056938
push {lr}
bl sub_80569BC
bl FieldClearVBlankHBlankCallbacks
bl StopMapMusic
bl sub_8056420
bl set_current_map_header_from_sav1
bl sub_80550A8
bl UnfreezeObjectEvents
bl sub_8054E40
bl sub_80589E8
bl InitMapFromSavedGame
bl PlayTimeCounter_Start
bl ScriptContext1_Init
bl ScriptContext2_Disable
@@ -3871,7 +3871,7 @@ _0805699C:
ldr r1, _080569B4 @ =sub_8056918
str r1, [r0]
ldr r0, _080569B8 @ =sub_8056534
bl sub_80565E0
bl SetMainCallback1
bl CB2_ReturnToField
_080569AC:
pop {r0}
@@ -3882,8 +3882,8 @@ _080569B4: .4byte sub_8056918
_080569B8: .4byte sub_8056534
thumb_func_end CB2_ContinueSavedGame
thumb_func_start sub_80569BC
sub_80569BC: @ 80569BC
thumb_func_start FieldClearVBlankHBlankCallbacks
FieldClearVBlankHBlankCallbacks: @ 80569BC
push {lr}
bl sub_80CC87C
lsls r0, 24
@@ -3915,7 +3915,7 @@ _080569F4:
bl SetHBlankCallback
pop {r0}
bx r0
thumb_func_end sub_80569BC
thumb_func_end FieldClearVBlankHBlankCallbacks
thumb_func_start SetFieldVBlankCallback
SetFieldVBlankCallback: @ 8056A04
@@ -3962,8 +3962,8 @@ _08056A52:
_08056A58: .4byte gFlashEffectParams
thumb_func_end InitCurrentFlashLevelScanlineEffect
thumb_func_start sub_8056A5C
sub_8056A5C: @ 8056A5C
thumb_func_start map_loading_iteration_3
map_loading_iteration_3: @ 8056A5C
push {r4,lr}
adds r4, r0, 0
ldrb r0, [r4]
@@ -3995,7 +3995,7 @@ _08056A78:
.4byte _08056B58
.4byte _08056B6A
_08056AB0:
bl sub_80562B0
bl InitOverworldBgs
bl ScriptContext1_Init
bl ScriptContext2_Disable
b _08056B62
@@ -4084,7 +4084,7 @@ _08056B70:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_8056A5C
thumb_func_end map_loading_iteration_3
thumb_func_start sub_8056B78
sub_8056B78: @ 8056B78
@@ -4121,8 +4121,8 @@ _08056B94:
.4byte _08056CC0
.4byte _08056BFA
_08056BD0:
bl sub_80562B0
bl sub_80569BC
bl InitOverworldBgs
bl FieldClearVBlankHBlankCallbacks
adds r0, r5, 0
bl sub_8055920
b _08056CCA
@@ -4266,7 +4266,7 @@ _08056CF0:
.4byte _08056D26
.4byte _08056D38
_08056D04:
bl sub_80562B0
bl InitOverworldBgs
bl sub_8111F14
movs r0, 0
bl sub_8057024
@@ -4331,8 +4331,8 @@ _08056D60:
.4byte _08056E34
.4byte _08056E46
_08056D98:
bl sub_80562B0
bl sub_80569BC
bl InitOverworldBgs
bl FieldClearVBlankHBlankCallbacks
b _08056E3E
_08056DA2:
bl sub_8111F14
@@ -4914,14 +4914,14 @@ _08057268: .4byte gLinkPlayers
thumb_func_start sub_805726C
sub_805726C: @ 805726C
push {lr}
bl sub_80569BC
bl FieldClearVBlankHBlankCallbacks
ldr r1, _08057298 @ =gUnknown_2036E28
movs r0, 0x1
strb r0, [r1]
bl ScriptContext1_Init
bl ScriptContext2_Disable
movs r0, 0
bl sub_80565E0
bl SetMainCallback1
ldr r0, _0805729C @ =sub_80C9BFC
bl SetMainCallback2
ldr r1, _080572A0 @ =gMain
@@ -4939,7 +4939,7 @@ _080572A4: .4byte sub_80572D8
thumb_func_start sub_80572A8
sub_80572A8: @ 80572A8
push {lr}
bl sub_80569BC
bl FieldClearVBlankHBlankCallbacks
ldr r0, _080572D0 @ =gUnknown_2036E28
movs r1, 0x1
strb r1, [r0]
@@ -4947,7 +4947,7 @@ sub_80572A8: @ 80572A8
bl ScriptContext1_Init
bl ScriptContext2_Disable
movs r0, 0
bl sub_80565E0
bl SetMainCallback1
ldr r0, _080572D4 @ =sub_80572D8
bl SetMainCallback2
pop {r0}
@@ -4964,7 +4964,7 @@ sub_80572D8: @ 80572D8
bl sub_8057300
bl SetFieldVBlankCallback
ldr r0, _080572F8 @ =sub_8056534
bl sub_80565E0
bl SetMainCallback1
ldr r0, _080572FC @ =sub_80565B4
bl SetMainCallback2
pop {r0}
@@ -5019,8 +5019,8 @@ _08057330:
.4byte _08057404
.4byte _0805740A
_0805735C:
bl sub_80562B0
bl sub_80569BC
bl InitOverworldBgs
bl FieldClearVBlankHBlankCallbacks
bl sub_8111F14
bl sub_81113E4
bl sub_8111438
@@ -5118,7 +5118,7 @@ _0805742A:
thumb_func_start sub_8057430
sub_8057430: @ 8057430
push {lr}
bl sub_80569BC
bl FieldClearVBlankHBlankCallbacks
bl StopMapMusic
ldr r1, _08057484 @ =gUnknown_2036E28
movs r0, 0x3
@@ -5128,7 +5128,7 @@ sub_8057430: @ 8057430
bl sub_80550A8
bl UnfreezeObjectEvents
bl sub_8054E40
bl sub_80589E8
bl InitMapFromSavedGame
bl PlayTimeCounter_Start
bl ScriptContext1_Init
ldr r1, _08057488 @ =gUnknown_2031DE0
@@ -5149,7 +5149,7 @@ _08057488: .4byte gUnknown_2031DE0
_0805748C: .4byte CB2_LoadMap
_08057490:
ldr r0, _080574A0 @ =sub_8056534
bl sub_80565E0
bl SetMainCallback1
bl CB2_ReturnToField
_0805749A:
pop {r0}
@@ -5313,7 +5313,7 @@ _08057560:
bl ScriptContext1_Init
bl ScriptContext2_Disable
movs r0, 0
bl sub_80565E0
bl SetMainCallback1
ldr r1, _08057614 @ =gFieldCallback2
ldr r0, _08057618 @ =sub_80574EC
str r0, [r1]
@@ -7979,7 +7979,7 @@ _08058978:
_0805898A:
adds r0, r5, 0
movs r1, 0
bl sub_8068EB4
bl UpdateObjectEventSpriteVisibility
ldrb r0, [r6]
lsls r0, 29
cmp r0, 0
asm/pokedex_screen.s
+1 -1
View File
@@ -1839,7 +1839,7 @@ _08106478:
bl FillWindowPixelBuffer
movs r0, 0xB0
movs r1, 0x1
bl sub_8107D38
bl ListMenuLoadStdPalAt
mov r0, r10
cmp r0, 0
beq _08106504
asm/pokemon_jump.s
+1 -1
View File
@@ -621,7 +621,7 @@ _08147A5C:
ldrh r0, [r4, 0x18]
strh r0, [r1, 0x2]
mov r0, sp
bl sub_80F9E2C
bl RfuPrepareSend0x2f00
b _08147A9E
.align 2, 0
_08147A88: .4byte gTasks+0x8
asm/pokemon_jump_2.s
+20 -17
View File
@@ -5,8 +5,8 @@
.text
thumb_func_start sub_8147AA8
sub_8147AA8: @ 8147AA8
thumb_func_start StartPokemonJump
StartPokemonJump: @ 8147AA8
push {r4-r7,lr}
adds r6, r1, 0
lsls r0, 16
@@ -73,7 +73,7 @@ _08147B42:
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_8147AA8
thumb_func_end StartPokemonJump
thumb_func_start sub_8147B48
sub_8147B48: @ 8147B48
@@ -2535,7 +2535,7 @@ _08148DEA:
ands r0, r1
cmp r0, 0
bne _08148E20
bl sub_800AAC0
bl Link_TryStartSend5FFF
_08148DFA:
ldr r0, _08148E0C @ =gUnknown_203F3D4
ldr r1, [r0]
@@ -4302,7 +4302,7 @@ sub_8149A6C: @ 8149A6C
ldr r0, [r0, 0x8]
str r0, [sp, 0x4]
mov r0, sp
bl sub_80F9E2C
bl RfuPrepareSend0x2f00
add sp, 0xC
pop {r0}
bx r0
@@ -4363,7 +4363,7 @@ sub_8149AE0: @ 8149AE0
strb r1, [r2]
str r0, [sp, 0x4]
mov r0, sp
bl sub_80F9E2C
bl RfuPrepareSend0x2f00
add sp, 0xC
pop {r0}
bx r0
@@ -4425,7 +4425,7 @@ sub_8149AF8: @ 8149AF8
ldrh r0, [r0, 0xE]
strh r0, [r1, 0x4]
mov r0, sp
bl sub_80F9E2C
bl RfuPrepareSend0x2f00
add sp, 0xC
pop {r3}
mov r8, r3
@@ -4520,7 +4520,7 @@ sub_8149BF4: @ 8149BF4
mov r0, sp
strb r1, [r0, 0x6]
strh r2, [r0, 0x8]
bl sub_80F9E2C
bl RfuPrepareSend0x2f00
add sp, 0xC
pop {r4}
pop {r0}
@@ -4665,7 +4665,7 @@ _08149D20: .4byte sub_8149DC8
sub_8149D24: @ 8149D24
push {lr}
bl FreeAllWindowBuffers
bl sub_815C9F4
bl DigitObjUtil_Teardown
pop {r0}
bx r0
thumb_func_end sub_8149D24
@@ -6284,7 +6284,10 @@ sub_814A9C8: @ 814A9C8
push {r4,lr}
sub sp, 0x10
mov r1, sp
movs r0, 0x40
movs r0, 0x40 @ strConvMode = 0
@ shape = SPRITE_SHAPE(8x8)
@ size = SPRITE_SIZE(8x8)
@ priority = 1
strb r0, [r1]
movs r0, 0x5
strb r0, [r1, 0x1]
@@ -6299,11 +6302,11 @@ sub_814A9C8: @ 814A9C8
ldr r0, _0814AA20 @ =gUnknown_846D968
str r0, [sp, 0xC]
movs r0, 0x2
bl sub_815C980
bl DigitObjUtil_Init
movs r0, 0
movs r1, 0
mov r2, sp
bl sub_815CA40
bl DigitObjUtil_CreatePrinter
mov r1, sp
movs r0, 0x4
strb r0, [r1, 0x1]
@@ -6314,7 +6317,7 @@ sub_814A9C8: @ 814A9C8
movs r0, 0x1
movs r1, 0
mov r2, sp
bl sub_815CA40
bl DigitObjUtil_CreatePrinter
add sp, 0x10
pop {r4}
pop {r0}
@@ -6329,7 +6332,7 @@ sub_814AA24: @ 814AA24
push {lr}
adds r1, r0, 0
movs r0, 0
bl sub_815CD70
bl DigitObjUtil_PrintNumOn
pop {r0}
bx r0
thumb_func_end sub_814AA24
@@ -6341,7 +6344,7 @@ sub_814AA34: @ 814AA34
lsls r1, 16
lsrs r1, 16
movs r0, 0x1
bl sub_815CD70
bl DigitObjUtil_PrintNumOn
pop {r0}
bx r0
thumb_func_end sub_814AA34
@@ -7699,7 +7702,7 @@ sub_814B43C: @ 814B43C
movs r1, 0x7
movs r2, 0x78
movs r3, 0x50
bl sub_815F138
bl StartMinigameCountdown
adds r0, r4, 0
bl sub_814B134
add sp, 0x4
@@ -7711,7 +7714,7 @@ sub_814B43C: @ 814B43C
thumb_func_start sub_814B460
sub_814B460: @ 814B460
push {lr}
bl sub_815F198
bl IsMinigameCountdownRunning
pop {r1}
bx r1
thumb_func_end sub_814B460
asm/pokemon_summary_screen.s
+1 -1
View File
@@ -3187,7 +3187,7 @@ _08135FC8: .4byte gUnknown_8E9B310
_08135FCC:
movs r0, 0x60
movs r1, 0x1
bl sub_8107D38
bl ListMenuLoadStdPalAt
ldr r0, _08135FE0 @ =gUnknown_84636C0
movs r1, 0x70
_08135FD8:
common_syms/AgbRfu_LinkManager.txt
+1
View File
@@ -0,0 +1 @@
lman
common_syms/help_system_812B1E0.txt
+1 -1
View File
@@ -1,2 +1,2 @@
gUnknown_3005E9C
sHelpSystemState
gSomeVariableBackup
common_syms/link.txt
+4 -4
View File
@@ -10,11 +10,11 @@ gFiller_3003EC0
gLinkHeldKeys
gRecvCmds
gLinkStatus
gUnknown_3003F24
gLinkAllAcked5FFF
gUnknown_3003F28
gUnknown_3003F2C
gUnknown_3003F30
gUnknown_3003F34
gLinkCommand2FFEAck
gLinkCommand5FFFAck
gLinkCmd5FFFparam
gSuppressLinkErrorMessage
gWirelessCommType
gSavedLinkPlayerCount
common_syms/link_rfu.txt
-1
View File
@@ -1 +0,0 @@
gUnknown_3005E10
common_syms/mevent.txt
+1 -1
View File
@@ -1 +1 @@
gUnknown_3005ED0
sMEventSendToEReaderManager
data/berry_crush.s
+19 -13
View File
@@ -339,22 +339,28 @@ gUnknown_846F458:: @ 846F458
gUnknown_846F470:: @ 846F470
spr_template 5, 5, gOamData_AffineDouble_ObjNormal_32x32, gUnknown_846F404, NULL, gUnknown_846F408, SpriteCallbackDummy
gUnknown_846F488:: @ 846F488 struct UnkStruct3? perhaps not
.byte 9, 2, 8
gUnknown_846F488:: @ 846F488 DigitObjUtilTemplate
@ strConvMode, shape, size, priority
.byte 1 | (2 /*ST_OAM_V_RECTANGLE*/ << 2) | (0 << 4) | (0 << 6) @ 9
.byte 2, 8 @ ndigits, width
.align 2
.2byte 0x9c, 0x00
.4byte gUnknown_846F2F8 + 0x18
.4byte gUnknown_846F320 + 0x10
.byte 8, 2, 8
.2byte 0x9c, 0x00 @ x, y
.4byte gUnknown_846F2F8 + 0x18 @ spriteSheet
.4byte gUnknown_846F320 + 0x10 @ spritePalette
@ strConvMode, shape, size, priority
.byte 0 | (2 /*ST_OAM_V_RECTANGLE*/ << 2) | (0 << 4) | (0 << 6) @ 8
.byte 2, 8 @ ndigits, width
.align 2
.2byte 0xb4, 0x00
.4byte gUnknown_846F2F8 + 0x18
.4byte gUnknown_846F320 + 0x10
.byte 8, 2, 8
.2byte 0xb4, 0x00 @ x, y
.4byte gUnknown_846F2F8 + 0x18 @ spriteSheet
.4byte gUnknown_846F320 + 0x10 @ spritePalette
@ strConvMode, shape, size, priority
.byte 0 | (2 /*ST_OAM_V_RECTANGLE*/ << 2) | (0 << 4) | (0 << 6) @ 8
.byte 2, 8 @ ndigits, width
.align 2
.2byte 0xcc, 0x00
.4byte gUnknown_846F2F8 + 0x18
.4byte gUnknown_846F320 + 0x10
.2byte 0xcc, 0x00 @ x, y
.4byte gUnknown_846F2F8 + 0x18 @ spriteSheet
.4byte gUnknown_846F320 + 0x10 @ spritePalette
gUnknown_846F4B8:: @ 846F4B8
.4byte gUnknown_841D034
data/data_8479668.s
-42
View File
@@ -174,52 +174,10 @@ gText_UnionRoomChatKeyboard_Emoji9::
gText_UnionRoomChatKeyboard_Emoji10::
.string "{EXTRA 210}{EXTRA 208}ょ: $"
// trainer_tower (again?)
@ 847ABAC
.align 2
.include "data/trainer_tower/trainers.inc"
.align 2
gUnknown_84827AC:: @ 84827AC
.byte 0x08, 0x01
.align 2
.4byte 0
gUnknown_84827B4:: @ 84827B4
.4byte gUnknown_847F16C
.4byte gUnknown_847D26C
.4byte gUnknown_84808AC
.4byte gUnknown_847ABAC
.4byte gUnknown_847CAAC
.4byte gUnknown_847E9AC
.4byte gUnknown_847AF8C
.4byte gUnknown_847CE8C
.4byte gUnknown_847DA2C
.4byte gUnknown_847BF0C
.4byte gUnknown_847D64C
.4byte gUnknown_847DE0C
.4byte gUnknown_847B74C
.4byte gUnknown_847BB2C
.4byte gUnknown_848182C
.4byte gUnknown_847F92C
.4byte gUnknown_847C2EC
.4byte gUnknown_847C6CC
.4byte gUnknown_847E5CC
.4byte gUnknown_84804CC
.4byte gUnknown_84823CC
.4byte gUnknown_8481FEC
.4byte gUnknown_84800EC
.4byte gUnknown_847E1EC
.4byte gUnknown_847ED8C
.4byte gUnknown_848106C
.4byte gUnknown_8480C8C
.4byte gUnknown_847F92C
.4byte gUnknown_847F54C
.4byte gUnknown_847E1EC
.4byte gUnknown_847D64C
.4byte gUnknown_847C6CC
.include "data/text/move_descriptions.inc"
.align 2, 0
data/event_object_80688E4.s
-97
View File
@@ -1,97 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_83A710C::
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
gUnknown_83A714C::
.4byte double_little_steps
.4byte double_little_steps
.4byte double_little_steps
.4byte double_little_steps
.4byte double_little_steps
.4byte double_little_steps
.4byte double_little_steps
.4byte double_little_steps
gUnknown_83A716C::
.4byte double_little_steps
.4byte triple_little_steps
.4byte triple_little_steps
.4byte double_little_steps
.4byte triple_little_steps
.4byte triple_little_steps
gUnknown_83A7184::
.4byte quad_little_steps
.4byte quad_little_steps
.4byte quad_little_steps
.4byte quad_little_steps
gUnknown_83A7194::
.4byte oct_little_steps
.4byte oct_little_steps
gUnknown_83A719C:: @ 83A719C
.4byte gUnknown_83A710C
.4byte gUnknown_83A714C
.4byte gUnknown_83A716C
.4byte gUnknown_83A7184
.4byte gUnknown_83A7194
gUnknown_83A71B0:: @ 83A71B0
.2byte 0x0010, 0x0008, 0x0006, 0x0004, 0x0002
gUnknown_83A71BA::
.byte 0xfc, 0xfa, 0xf8, 0xf6, 0xf5, 0xf4, 0xf4, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xfa, 0xfc, 0x00, 0x00
gUnknown_83A71CA::
.byte 0x00, 0xfe, 0xfd, 0xfc, 0xfb, 0xfa, 0xfa, 0xfa, 0xfb, 0xfb, 0xfc, 0xfd, 0xfe, 0x00, 0x00, 0x00
gUnknown_83A71DA::
.byte 0xfe, 0xfc, 0xfa, 0xf8, 0xf7, 0xf6, 0xf6, 0xf6, 0xf7, 0xf8, 0xfa, 0xfb, 0xfd, 0xfe, 0x00, 0x00
.align 2
gUnknown_83A71EC:: @ 83A71EC
.4byte gUnknown_83A71BA
.4byte gUnknown_83A71CA
.4byte gUnknown_83A71DA
.align 1
gUnknown_83A71F8:: @ 83A71F8
.2byte 0x10, 0x10, 0x20
gUnknown_83A71FE:: @ 83A71FE
.byte 0, 0, 1
.align 1
gUnknown_83A7202:: @ 83A7202
.2byte 0x20, 0x20, 0x40
gUnknown_83A7208:: @ 83A7208
.byte 1, 1, 2
.align 2
gUnknown_83A720C:: @ 83A720C
abspath "evobjmv.c"
.align 2
gUnknown_83A7240:: @ 83A7240
.asciz "0"
data/event_scripts.s
+62 -505
View File
@@ -17,19 +17,24 @@
#include "constants/spawn_points.h"
#include "constants/field_effects.h"
#include "constants/trainers.h"
#include "constants/trainer_tower.h"
#include "constants/object_events.h"
#include "constants/fame_checker.h"
#include "constants/seagallop.h"
#include "constants/game_stat.h"
#include "constants/coins.h"
#include "constants/menu.h"
#include "constants/battle_setup.h"
#include "constants/map_scripts.h"
#include "constants/cable_club.h"
#include "constants/field_tasks.h"
#include "constants/field_weather.h"
#include "constants/weather.h"
#include "constants/union_room.h"
#include "constants/trade.h"
#include "constants/quest_log.h"
#include "constants/daycare.h"
#include "constants/easy_chat.h"
.include "asm/macros.inc"
.include "asm/macros/event.inc"
.set FALSE, 0
@@ -208,17 +213,17 @@ gStdScriptsEnd::
.include "data/maps/SixIsland_PatternBush/scripts.inc"
.include "data/maps/SixIsland_AlteringCave/scripts.inc"
.include "data/maps/NavelRock_Exterior/scripts.inc"
.include "data/maps/SevenIsland_TrainerTower_1F/scripts.inc"
.include "data/maps/SevenIsland_TrainerTower_2F/scripts.inc"
.include "data/maps/SevenIsland_TrainerTower_3F/scripts.inc"
.include "data/maps/SevenIsland_TrainerTower_4F/scripts.inc"
.include "data/maps/SevenIsland_TrainerTower_5F/scripts.inc"
.include "data/maps/SevenIsland_TrainerTower_6F/scripts.inc"
.include "data/maps/SevenIsland_TrainerTower_7F/scripts.inc"
.include "data/maps/SevenIsland_TrainerTower_8F/scripts.inc"
.include "data/maps/SevenIsland_TrainerTower_Roof/scripts.inc"
.include "data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc"
.include "data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc"
.include "data/maps/TrainerTower_1F/scripts.inc"
.include "data/maps/TrainerTower_2F/scripts.inc"
.include "data/maps/TrainerTower_3F/scripts.inc"
.include "data/maps/TrainerTower_4F/scripts.inc"
.include "data/maps/TrainerTower_5F/scripts.inc"
.include "data/maps/TrainerTower_6F/scripts.inc"
.include "data/maps/TrainerTower_7F/scripts.inc"
.include "data/maps/TrainerTower_8F/scripts.inc"
.include "data/maps/TrainerTower_Roof/scripts.inc"
.include "data/maps/TrainerTower_Lobby/scripts.inc"
.include "data/maps/TrainerTower_Elevator/scripts.inc"
.include "data/maps/FiveIsland_LostCave_Entrance/scripts.inc"
.include "data/maps/FiveIsland_LostCave_Room1/scripts.inc"
.include "data/maps/FiveIsland_LostCave_Room2/scripts.inc"
@@ -278,7 +283,7 @@ gStdScriptsEnd::
.include "data/maps/CinnabarIsland/scripts.inc"
.include "data/maps/IndigoPlateau_Exterior/scripts.inc"
.include "data/maps/SaffronCity/scripts.inc"
.include "data/maps/SaffronCity_Classic/scripts.inc"
.include "data/maps/SaffronCity_Connection/scripts.inc"
.include "data/maps/OneIsland/scripts.inc"
.include "data/maps/TwoIsland/scripts.inc"
.include "data/maps/ThreeIsland/scripts.inc"
@@ -317,10 +322,10 @@ gStdScriptsEnd::
.include "data/maps/TwoIsland_CapeBrink/scripts.inc"
.include "data/maps/ThreeIsland_BondBridge/scripts.inc"
.include "data/maps/ThreeIsland_Port/scripts.inc"
.include "data/maps/UnknownMap_03_50/scripts.inc"
.include "data/maps/UnknownMap_03_51/scripts.inc"
.include "data/maps/UnknownMap_03_52/scripts.inc"
.include "data/maps/UnknownMap_03_53/scripts.inc"
.include "data/maps/Prototype_SeviiIsle_6/scripts.inc"
.include "data/maps/Prototype_SeviiIsle_7/scripts.inc"
.include "data/maps/Prototype_SeviiIsle_8/scripts.inc"
.include "data/maps/Prototype_SeviiIsle_9/scripts.inc"
.include "data/maps/FiveIsland_ResortGorgeous/scripts.inc"
.include "data/maps/FiveIsland_WaterLabyrinth/scripts.inc"
.include "data/maps/FiveIsland_Meadow/scripts.inc"
@@ -415,15 +420,15 @@ gStdScriptsEnd::
.include "data/maps/CinnabarIsland_Mart/scripts.inc"
.include "data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc"
.include "data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc"
.include "data/maps/SaffronCity_House1_1F/scripts.inc"
.include "data/maps/SaffronCity_House1_2F/scripts.inc"
.include "data/maps/SaffronCity_CopycatsHouse_1F/scripts.inc"
.include "data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc"
.include "data/maps/SaffronCity_Dojo/scripts.inc"
.include "data/maps/SaffronCity_Gym/scripts.inc"
.include "data/maps/SaffronCity_House2/scripts.inc"
.include "data/maps/SaffronCity_House/scripts.inc"
.include "data/maps/SaffronCity_Mart/scripts.inc"
.include "data/maps/SaffronCity_PokemonCenter_1F/scripts.inc"
.include "data/maps/SaffronCity_PokemonCenter_2F/scripts.inc"
.include "data/maps/SaffronCity_House3/scripts.inc"
.include "data/maps/SaffronCity_MrPsychicsHouse/scripts.inc"
.include "data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc"
.include "data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc"
.include "data/maps/Route2_House/scripts.inc"
@@ -593,7 +598,7 @@ gStdScriptsEnd::
.include "data/maps/FiveIsland_RocketWarehouse/text.inc"
.include "data/maps/SixIsland_DottedHole_SapphireRoom/text.inc"
.include "data/maps/SixIsland_PatternBush/text.inc"
.include "data/maps/SevenIsland_TrainerTower_Lobby/text.inc"
.include "data/maps/TrainerTower_Lobby/text.inc"
.include "data/maps/FiveIsland_LostCave_Room1/text.inc"
.include "data/maps/FiveIsland_LostCave_Room4/text.inc"
.include "data/maps/FiveIsland_LostCave_Room10/text.inc"
@@ -658,6 +663,7 @@ gStdScriptsEnd::
.include "data/maps/SevenIsland_TrainerTower/text.inc"
.include "data/maps/SevenIsland_SevaultCanyon_Entrance/text.inc"
.include "data/maps/SevenIsland_SevaultCanyon/text.inc"
.include "data/maps/SevenIsland_TanobyRuins/text.inc"
.include "data/maps/PalletTown_PlayersHouse_1F/text.inc"
.include "data/maps/PalletTown_PlayersHouse_2F/text.inc"
.include "data/maps/PalletTown_GarysHouse/text.inc"
@@ -730,14 +736,14 @@ gStdScriptsEnd::
.include "data/maps/CinnabarIsland_PokemonCenter_1F/text.inc"
.include "data/maps/CinnabarIsland_Mart/text.inc"
.include "data/maps/IndigoPlateau_PokemonCenter_1F/text.inc"
.include "data/maps/SaffronCity_House1_1F/text.inc"
.include "data/maps/SaffronCity_House1_2F/text.inc"
.include "data/maps/SaffronCity_CopycatsHouse_1F/text.inc"
.include "data/maps/SaffronCity_CopycatsHouse_2F/text.inc"
.include "data/maps/SaffronCity_Dojo/text.inc"
.include "data/maps/SaffronCity_Gym/text.inc"
.include "data/maps/SaffronCity_House2/text.inc"
.include "data/maps/SaffronCity_House/text.inc"
.include "data/maps/SaffronCity_Mart/text.inc"
.include "data/maps/SaffronCity_PokemonCenter_1F/text.inc"
.include "data/maps/SaffronCity_House3/text.inc"
.include "data/maps/SaffronCity_MrPsychicsHouse/text.inc"
.include "data/maps/SaffronCity_PokemonTrainerFanClub/text.inc"
.include "data/maps/Route2_ViridianForest_SouthEntrance/text.inc"
.include "data/maps/Route2_House/text.inc"
@@ -966,7 +972,7 @@ Text_HavePokedexRated:: @ 81A5C03
Text_ClosedLinkToProfOaksPC:: @ 81A5C2E
.string "Closed link to PROF. OAK's PC.$"
Text_1A5C4D:: @ 81A5C4D
Text_VoiceRangOutDontRunAway:: @ 81A5C4D
.string "Someone's voice rang out,\n"
.string "“Don't run away!”$"
@@ -1169,10 +1175,9 @@ EventScript_ResetEliteFour:: @ 81A6551
.include "data/scripts/obtain_item.inc"
.include "data/scripts/pc.inc"
@ DoEasyChatScreen?
EventScript_1A6AC0:: @ 81A6AC0
Common_ShowEasyChatScreen:: @ 81A6AC0
fadescreen FADE_TO_BLACK
special sub_80FEE44
special ShowEasyChatScreen
fadescreen FADE_FROM_BLACK
return
@@ -1258,71 +1263,7 @@ EventScript_1A74F2:: @ 81A74F2
removeitem VAR_0x8004, 1
return
EventScript_1A7506:: @ 81A7506
applymovement OBJ_EVENT_ID_PLAYER, Movement_Delay32
waitmovement 0
playse SE_DOOR
call EventScript_1A7538
special DrawWholeMapView
setflag FLAG_TEMP_4
return
EventScript_1A751F:: @ 81A751F
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkUp5
waitmovement 0
setflag FLAG_TEMP_2
playse SE_KI_GASYAN
call EventScript_1A759C
special DrawWholeMapView
return
EventScript_1A7538:: @ 81A7538
setmetatile 6, 1, 654, 1
setmetatile 6, 2, 662, 0
return
EventScript_1A754B:: @ 81A754B
lockall
textcolor 0
msgbox Text_1A5C4D
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75D3
waitmovement 0
releaseall
end
EventScript_1A7563:: @ 81A7563
applymovement OBJ_EVENT_ID_PLAYER, Movement_Delay32
waitmovement 0
playse SE_DOOR
setmetatile 6, 4, 654, 1
setmetatile 6, 5, 662, 0
special DrawWholeMapView
setflag FLAG_TEMP_4
return
EventScript_1A7589:: @ 81A7589
setmetatile 6, 4, 654, 1
setmetatile 6, 5, 662, 0
return
EventScript_1A759C:: @ 81A759C
setmetatile 5, 11, 669, 1
setmetatile 6, 11, 670, 1
setmetatile 7, 11, 671, 1
setmetatile 5, 12, 677, 1
setmetatile 6, 12, 678, 1
setmetatile 7, 12, 679, 1
return
Movement_1A75D3:: @ 81A75D3
walk_up
step_end
EventScript_1A75D5:: @ 81A75D5
special Special_PokemonLeagueLightingEffect
return
.include "data/scripts/pokemon_league.inc"
.include "data/scripts/movement.inc"
.include "data/scripts/flavor_text.inc"
@@ -1332,8 +1273,8 @@ gUnknown_81A7702:: @ 81A7702
msgbox Text_FillOutQuestionnaire, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_1A778A
setvar VAR_0x8004, 14
call EventScript_1A6AC0
setvar VAR_0x8004, EASY_CHAT_TYPE_QUESTIONNAIRE
call Common_ShowEasyChatScreen
lock
faceplayer
specialvar VAR_0x8008, Special_GetMartClerkObjectId
@@ -1407,7 +1348,7 @@ Route18_EastEntrance_1F_EventScript_1A77C1:: @ 81A77C1
.include "data/scripts/route23.inc"
EventScript_1A7AB9:: @ 81A7AB9
EventScript_GetElevatorFloor:: @ 81A7AB9
special Special_GetElevatorFloor
return
@@ -1648,9 +1589,9 @@ EventScript_1A8EC0:: @ 81A8EC0
.include "data/scripts/seagallop.inc"
.include "data/scripts/static_pokemon.inc"
EventScript_1A925E:: @ 81A925E
EventScript_TryDarkenRuins:: @ 81A925E
goto_if_set FLAG_SYS_UNLOCKED_TANOBY_RUINS, EventScript_Return
setweather 11
setweather WEATHER_SHADE
doweather
return
@@ -1680,419 +1621,35 @@ Text_1ACD45:: @ 81ACD45
.include "data/scripts/fame_checker.inc"
.include "data/text/fame_checker.inc"
CeladonCity_GameCorner_EventScript_1B2867:: @ 81B2867
lockall
showmoneybox 0, 0, 0
msgbox gUnknown_81B1D7D, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_1B2926
checkmoney 50, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_1B292B
playse SE_SHOP
removemoney 50, 0
updatemoneybox 0, 0, 0
waitse
message gUnknown_81B1E24
waitmessage
multichoice 21, 0, MULTICHOICE_TRAINER_CARD_ICON_TINT, TRUE
switch VAR_RESULT
case 0, EventScript_1B28DB
case 1, EventScript_1B28E6
case 2, EventScript_1B28F1
case 3, EventScript_1B28FC
end
gUnknown_81B1C8B:: @ 81B1C8B
.string "Hmm…\n"
.string "Is that right…$"
EventScript_1B28DB:: @ 81B28DB
setvar VAR_0x8004, 0
goto EventScript_1B2907
gUnknown_81B1C9F:: @ 81B1C9F
.string "Oh!\n"
.string "Look, look!$"
EventScript_1B28E5:: @ 81B28E5
end
gUnknown_81B1CAF:: @ 81B1CAF
.string "Read it, read it!$"
EventScript_1B28E6:: @ 81B28E6
setvar VAR_0x8004, 1
goto EventScript_1B2907
gUnknown_81B1CC1:: @ 81B1CC1
.string "TRAINER TIPS\p"
.string "Press START to open the MENU!$"
EventScript_1B28F0:: @ 81B28F0
end
gUnknown_81B1CEC:: @ 81B1CEC
.string "Signs are useful, aren't they?$"
EventScript_1B28F1:: @ 81B28F1
setvar VAR_0x8004, 2
goto EventScript_1B2907
gUnknown_81B1D0B:: @ 81B1D0B
.string "Look, look!\p"
.string "I copied what it said on one of\n"
.string "those TRAINER TIPS signs!$"
EventScript_1B28FB:: @ 81B28FB
end
EventScript_1B28FC:: @ 81B28FC
setvar VAR_0x8004, 3
goto EventScript_1B2907
EventScript_1B2906:: @ 81B2906
end
EventScript_1B2907:: @ 81B2907
message gUnknown_81B1E42
waitmessage
playse MUS_ME_PHOTO
dofieldeffect FLDEFF_UNK_45
delay 60
special Special_UpdateTrainerCardPhotoIcons
msgbox gUnknown_81B1E7D
hidemoneybox 0, 0
releaseall
end
EventScript_1B2926:: @ 81B2926
hidemoneybox 0, 0
releaseall
end
EventScript_1B292B:: @ 81B292B
msgbox gUnknown_81B1E07
hidemoneybox 0, 0
releaseall
end
FourIsland_House2_EventScript_1B2938:: @ 81B2938
lock
specialvar VAR_0x8008, Special_StickerLadyGetBragFlags
goto_if_unset FLAG_MET_STICKER_LADY, EventScript_1B2951
goto_if_set FLAG_MET_STICKER_LADY, EventScript_1B2994
end
EventScript_1B2951:: @ 81B2951
setflag FLAG_MET_STICKER_LADY
msgbox gUnknown_81B1EB3
applymovement 1, Movement_FacePlayer
waitmovement 0
playse SE_PIN
applymovement 1, Movement_ExclamationMark
waitmovement 0
applymovement 1, Movement_Delay48
waitmovement 0
compare VAR_0x8008, 0
goto_if_eq EventScript_1B2B8E
message gUnknown_81B1EF8
waitmessage
goto EventScript_1B29D0
EventScript_1B2993:: @ 81B2993
end
EventScript_1B2994:: @ 81B2994
applymovement 1, Movement_FacePlayer
waitmovement 0
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
compare VAR_0x8008, 0
goto_if_eq EventScript_1B29C6
message gUnknown_81B2025
waitmessage
goto EventScript_1B29D0
EventScript_1B29C5:: @ 81B29C5
end
EventScript_1B29C6:: @ 81B29C6
msgbox gUnknown_81B1FEF
release
end
EventScript_1B29D0:: @ 81B29D0
switch VAR_0x8008
case 1, EventScript_1B2A23
case 2, EventScript_1B2A4F
case 4, EventScript_1B2A7B
case 3, EventScript_1B2AA7
case 5, EventScript_1B2ADE
case 6, EventScript_1B2B15
case 7, EventScript_1B2B4C
end
EventScript_1B2A23:: @ 81B2A23
multichoice 15, 8, MULTICHOICE_HOF_QUIT, FALSE
switch VAR_RESULT
case 0, EventScript_1B2B98
case 1, EventScript_1B2DF6
case SCR_MENU_CANCEL, EventScript_1B2DF6
end
EventScript_1B2A4F:: @ 81B2A4F
multichoice 16, 8, MULTICHOICE_EGGS_QUIT, FALSE
switch VAR_RESULT
case 0, EventScript_1B2C62
case 1, EventScript_1B2DF6
case SCR_MENU_CANCEL, EventScript_1B2DF6
end
EventScript_1B2A7B:: @ 81B2A7B
multichoice 15, 8, MULTICHOICE_VICTORIES_QUIT, FALSE
switch VAR_RESULT
case 0, EventScript_1B2D2C
case 1, EventScript_1B2DF6
case SCR_MENU_CANCEL, EventScript_1B2DF6
end
EventScript_1B2AA7:: @ 81B2AA7
multichoice 15, 6, MULTICHOICE_HOF_EGGS_QUIT, FALSE
switch VAR_RESULT
case 0, EventScript_1B2B98
case 1, EventScript_1B2C62
case 2, EventScript_1B2DF6
case SCR_MENU_CANCEL, EventScript_1B2DF6
end
EventScript_1B2ADE:: @ 81B2ADE
multichoice 15, 6, MULTICHOICE_HOF_VICTORIES_QUIT, FALSE
switch VAR_RESULT
case 0, EventScript_1B2B98
case 1, EventScript_1B2D2C
case 2, EventScript_1B2DF6
case SCR_MENU_CANCEL, EventScript_1B2DF6
end
EventScript_1B2B15:: @ 81B2B15
multichoice 15, 6, MULTICHOICE_EGGS_VICTORIES_QUIT, FALSE
switch VAR_RESULT
case 0, EventScript_1B2C62
case 1, EventScript_1B2D2C
case 2, EventScript_1B2DF6
case SCR_MENU_CANCEL, EventScript_1B2DF6
end
EventScript_1B2B4C:: @ 81B2B4C
multichoice 15, 5, MULTICHOICE_HOF_EGGS_VICTORIES_QUIT, FALSE
switch VAR_RESULT
case 0, EventScript_1B2B98
case 1, EventScript_1B2C62
case 2, EventScript_1B2D2C
case 3, EventScript_1B2DF6
case SCR_MENU_CANCEL, EventScript_1B2DF6
end
EventScript_1B2B8E:: @ 81B2B8E
msgbox gUnknown_81B1EF8
release
end
EventScript_1B2B98:: @ 81B2B98
compare VAR_0x8004, 39
goto_if_le EventScript_1B2BC5
compare VAR_0x8004, 99
goto_if_le EventScript_1B2BE3
compare VAR_0x8004, 199
goto_if_le EventScript_1B2C01
compare VAR_0x8004, 200
goto_if_ge EventScript_1B2C1F
end
EventScript_1B2BC5:: @ 81B2BC5
compare VAR_HOF_BRAG_STATE, 1
goto_if_eq EventScript_1B2C3D
setvar VAR_HOF_BRAG_STATE, 1
msgbox gUnknown_81B206E
goto EventScript_1B2C51
EventScript_1B2BE2:: @ 81B2BE2
end
EventScript_1B2BE3:: @ 81B2BE3
compare VAR_HOF_BRAG_STATE, 2
goto_if_eq EventScript_1B2C3D
setvar VAR_HOF_BRAG_STATE, 2
msgbox gUnknown_81B20CF
goto EventScript_1B2C51
EventScript_1B2C00:: @ 81B2C00
end
EventScript_1B2C01:: @ 81B2C01
compare VAR_HOF_BRAG_STATE, 3
goto_if_eq EventScript_1B2C3D
setvar VAR_HOF_BRAG_STATE, 3
msgbox gUnknown_81B2133
goto EventScript_1B2C51
EventScript_1B2C1E:: @ 81B2C1E
end
EventScript_1B2C1F:: @ 81B2C1F
compare VAR_HOF_BRAG_STATE, 4
goto_if_eq EventScript_1B2C47
setvar VAR_HOF_BRAG_STATE, 4
msgbox gUnknown_81B21C4
goto EventScript_1B2C51
EventScript_1B2C3C:: @ 81B2C3C
end
EventScript_1B2C3D:: @ 81B2C3D
msgbox gUnknown_81B227C
release
end
EventScript_1B2C47:: @ 81B2C47
msgbox gUnknown_81B22B0
release
end
EventScript_1B2C51:: @ 81B2C51
textcolor 3
playfanfare MUS_FANFA1
message gUnknown_81B2242
waitmessage
waitfanfare
delay 90
release
end
EventScript_1B2C62:: @ 81B2C62
compare VAR_0x8005, 99
goto_if_le EventScript_1B2C8F
compare VAR_0x8005, 199
goto_if_le EventScript_1B2CAD
compare VAR_0x8005, 299
goto_if_le EventScript_1B2CCB
compare VAR_0x8005, 300
goto_if_ge EventScript_1B2CE9
end
EventScript_1B2C8F:: @ 81B2C8F
compare VAR_EGG_BRAG_STATE, 1
goto_if_eq EventScript_1B2D07
setvar VAR_EGG_BRAG_STATE, 1
msgbox gUnknown_81B2308
goto EventScript_1B2D1B
EventScript_1B2CAC:: @ 81B2CAC
end
EventScript_1B2CAD:: @ 81B2CAD
compare VAR_EGG_BRAG_STATE, 2
goto_if_eq EventScript_1B2D07
setvar VAR_EGG_BRAG_STATE, 2
msgbox gUnknown_81B2372
goto EventScript_1B2D1B
EventScript_1B2CCA:: @ 81B2CCA
end
EventScript_1B2CCB:: @ 81B2CCB
compare VAR_EGG_BRAG_STATE, 3
goto_if_eq EventScript_1B2D07
setvar VAR_EGG_BRAG_STATE, 3
msgbox gUnknown_81B23E0
goto EventScript_1B2D1B
EventScript_1B2CE8:: @ 81B2CE8
end
EventScript_1B2CE9:: @ 81B2CE9
compare VAR_EGG_BRAG_STATE, 4
goto_if_eq EventScript_1B2D11
setvar VAR_EGG_BRAG_STATE, 4
msgbox gUnknown_81B2448
goto EventScript_1B2D1B
EventScript_1B2D06:: @ 81B2D06
end
EventScript_1B2D07:: @ 81B2D07
msgbox gUnknown_81B251B
release
end
EventScript_1B2D11:: @ 81B2D11
msgbox gUnknown_81B254F
release
end
EventScript_1B2D1B:: @ 81B2D1B
textcolor 3
playfanfare MUS_FANFA1
message gUnknown_81B24EA
waitmessage
waitfanfare
delay 90
release
end
EventScript_1B2D2C:: @ 81B2D2C
compare VAR_0x8006, 19
goto_if_le EventScript_1B2D59
compare VAR_0x8006, 49
goto_if_le EventScript_1B2D77
compare VAR_0x8006, 99
goto_if_le EventScript_1B2D95
compare VAR_0x8006, 100
goto_if_ge EventScript_1B2DB3
end
EventScript_1B2D59:: @ 81B2D59
compare VAR_LINK_WIN_BRAG_STATE, 1
goto_if_eq EventScript_1B2DD1
setvar VAR_LINK_WIN_BRAG_STATE, 1
msgbox gUnknown_81B25A7
goto EventScript_1B2DE5
EventScript_1B2D76:: @ 81B2D76
end
EventScript_1B2D77:: @ 81B2D77
compare VAR_LINK_WIN_BRAG_STATE, 2
goto_if_eq EventScript_1B2DD1
setvar VAR_LINK_WIN_BRAG_STATE, 2
msgbox gUnknown_81B2609
goto EventScript_1B2DE5
EventScript_1B2D94:: @ 81B2D94
end
EventScript_1B2D95:: @ 81B2D95
compare VAR_LINK_WIN_BRAG_STATE, 3
goto_if_eq EventScript_1B2DD1
setvar VAR_LINK_WIN_BRAG_STATE, 3
msgbox gUnknown_81B267B
goto EventScript_1B2DE5
EventScript_1B2DB2:: @ 81B2DB2
end
EventScript_1B2DB3:: @ 81B2DB3
compare VAR_LINK_WIN_BRAG_STATE, 4
goto_if_eq EventScript_1B2DDB
setvar VAR_LINK_WIN_BRAG_STATE, 4
msgbox gUnknown_81B26F6
goto EventScript_1B2DE5
EventScript_1B2DD0:: @ 81B2DD0
end
EventScript_1B2DD1:: @ 81B2DD1
msgbox gUnknown_81B27DB
release
end
EventScript_1B2DDB:: @ 81B2DDB
msgbox gUnknown_81B280F
release
end
EventScript_1B2DE5:: @ 81B2DE5
textcolor 3
playfanfare MUS_FANFA1
message gUnknown_81B27A6
waitmessage
waitfanfare
delay 90
release
end
EventScript_1B2DF6:: @ 81B2DF6
release
end
gUnknown_81B1D51:: @ 81B1D51
.string "TRAINER TIPS!\p"
.string "Press START to open the MENU!$"
.include "data/text/trainer_card.inc"
.include "data/scripts/trainer_card.inc"
.include "data/text/help_system.inc"
.include "data/scripts/cable_club.inc"
.include "data/scripts/field_moves.inc"
data/graphics.s
+57 -57
View File
@@ -16387,26 +16387,26 @@ gUnionRoomChatIcons:: @ 8EA1A50
.incbin "graphics/interface/union_room_chat_icons.4bpp.lz"
.align 2
gTilesetPalettes_8EA1B68:: @ 8EA1B68
.incbin "data/tilesets/primary/82D4A94/palettes/0.gbapal"
.incbin "data/tilesets/primary/82D4A94/palettes/1.gbapal"
.incbin "data/tilesets/primary/82D4A94/palettes/2.gbapal"
.incbin "data/tilesets/primary/82D4A94/palettes/3.gbapal"
.incbin "data/tilesets/primary/82D4A94/palettes/4.gbapal"
.incbin "data/tilesets/primary/82D4A94/palettes/5.gbapal"
.incbin "data/tilesets/primary/82D4A94/palettes/6.gbapal"
.incbin "data/tilesets/primary/82D4A94/palettes/7.gbapal"
.incbin "data/tilesets/primary/82D4A94/palettes/8.gbapal"
.incbin "data/tilesets/primary/82D4A94/palettes/9.gbapal"
.incbin "data/tilesets/primary/82D4A94/palettes/10.gbapal"
.incbin "data/tilesets/primary/82D4A94/palettes/11.gbapal"
.incbin "data/tilesets/primary/82D4A94/palettes/12.gbapal"
.incbin "data/tilesets/primary/82D4A94/palettes/13.gbapal"
.incbin "data/tilesets/primary/82D4A94/palettes/14.gbapal"
.incbin "data/tilesets/primary/82D4A94/palettes/15.gbapal"
gTilesetPalettes_General:: @ 8EA1B68
.incbin "data/tilesets/primary/general/palettes/0.gbapal"
.incbin "data/tilesets/primary/general/palettes/1.gbapal"
.incbin "data/tilesets/primary/general/palettes/2.gbapal"
.incbin "data/tilesets/primary/general/palettes/3.gbapal"
.incbin "data/tilesets/primary/general/palettes/4.gbapal"
.incbin "data/tilesets/primary/general/palettes/5.gbapal"
.incbin "data/tilesets/primary/general/palettes/6.gbapal"
.incbin "data/tilesets/primary/general/palettes/7.gbapal"
.incbin "data/tilesets/primary/general/palettes/8.gbapal"
.incbin "data/tilesets/primary/general/palettes/9.gbapal"
.incbin "data/tilesets/primary/general/palettes/10.gbapal"
.incbin "data/tilesets/primary/general/palettes/11.gbapal"
.incbin "data/tilesets/primary/general/palettes/12.gbapal"
.incbin "data/tilesets/primary/general/palettes/13.gbapal"
.incbin "data/tilesets/primary/general/palettes/14.gbapal"
.incbin "data/tilesets/primary/general/palettes/15.gbapal"
gTilesetTiles_8EA1D68:: @ 8EA1D68
.incbin "data/tilesets/primary/82D4A94/tiles.4bpp.lz"
gTilesetTiles_General:: @ 8EA1D68
.incbin "data/tilesets/primary/general/tiles.4bpp.lz"
gBerryFixGameboy_Pal:: @ 8EA463C
.incbin "graphics/berry_fix/gba_small.gbapal"
@@ -16463,50 +16463,50 @@ gBerryFixWindow_Tilemap:: @ 8EA9588
.incbin "graphics/berry_fix/window.bin.lz"
.align 2
gTilesetPalettes_8EA97F4:: @ 8EA97F4
.incbin "data/tilesets/secondary/82D4C74/palettes/0.gbapal"
.incbin "data/tilesets/secondary/82D4C74/palettes/1.gbapal"
.incbin "data/tilesets/secondary/82D4C74/palettes/2.gbapal"
.incbin "data/tilesets/secondary/82D4C74/palettes/3.gbapal"
.incbin "data/tilesets/secondary/82D4C74/palettes/4.gbapal"
.incbin "data/tilesets/secondary/82D4C74/palettes/5.gbapal"
.incbin "data/tilesets/secondary/82D4C74/palettes/6.gbapal"
.incbin "data/tilesets/secondary/82D4C74/palettes/7.gbapal"
.incbin "data/tilesets/secondary/82D4C74/palettes/8.gbapal"
.incbin "data/tilesets/secondary/82D4C74/palettes/9.gbapal"
.incbin "data/tilesets/secondary/82D4C74/palettes/10.gbapal"
.incbin "data/tilesets/secondary/82D4C74/palettes/11.gbapal"
.incbin "data/tilesets/secondary/82D4C74/palettes/12.gbapal"
.incbin "data/tilesets/secondary/82D4C74/palettes/13.gbapal"
.incbin "data/tilesets/secondary/82D4C74/palettes/14.gbapal"
.incbin "data/tilesets/secondary/82D4C74/palettes/15.gbapal"
gTilesetPalettes_GenericBuilding1:: @ 8EA97F4
.incbin "data/tilesets/secondary/generic_building1/palettes/0.gbapal"
.incbin "data/tilesets/secondary/generic_building1/palettes/1.gbapal"
.incbin "data/tilesets/secondary/generic_building1/palettes/2.gbapal"
.incbin "data/tilesets/secondary/generic_building1/palettes/3.gbapal"
.incbin "data/tilesets/secondary/generic_building1/palettes/4.gbapal"
.incbin "data/tilesets/secondary/generic_building1/palettes/5.gbapal"
.incbin "data/tilesets/secondary/generic_building1/palettes/6.gbapal"
.incbin "data/tilesets/secondary/generic_building1/palettes/7.gbapal"
.incbin "data/tilesets/secondary/generic_building1/palettes/8.gbapal"
.incbin "data/tilesets/secondary/generic_building1/palettes/9.gbapal"
.incbin "data/tilesets/secondary/generic_building1/palettes/10.gbapal"
.incbin "data/tilesets/secondary/generic_building1/palettes/11.gbapal"
.incbin "data/tilesets/secondary/generic_building1/palettes/12.gbapal"
.incbin "data/tilesets/secondary/generic_building1/palettes/13.gbapal"
.incbin "data/tilesets/secondary/generic_building1/palettes/14.gbapal"
.incbin "data/tilesets/secondary/generic_building1/palettes/15.gbapal"
.align 2
gTilesetTiles_8EA99F4:: @ 8EA99F4
.incbin "data/tilesets/secondary/82D4C74/tiles.4bpp.lz"
gTilesetTiles_GenericBuilding1:: @ 8EA99F4
.incbin "data/tilesets/secondary/generic_building1/tiles.4bpp.lz"
.align 2
gTilesetPalettes_8EA9D88:: @ 8EA9D88
.incbin "data/tilesets/secondary/82D4E6C/palettes/0.gbapal"
.incbin "data/tilesets/secondary/82D4E6C/palettes/1.gbapal"
.incbin "data/tilesets/secondary/82D4E6C/palettes/2.gbapal"
.incbin "data/tilesets/secondary/82D4E6C/palettes/3.gbapal"
.incbin "data/tilesets/secondary/82D4E6C/palettes/4.gbapal"
.incbin "data/tilesets/secondary/82D4E6C/palettes/5.gbapal"
.incbin "data/tilesets/secondary/82D4E6C/palettes/6.gbapal"
.incbin "data/tilesets/secondary/82D4E6C/palettes/7.gbapal"
.incbin "data/tilesets/secondary/82D4E6C/palettes/8.gbapal"
.incbin "data/tilesets/secondary/82D4E6C/palettes/9.gbapal"
.incbin "data/tilesets/secondary/82D4E6C/palettes/10.gbapal"
.incbin "data/tilesets/secondary/82D4E6C/palettes/11.gbapal"
.incbin "data/tilesets/secondary/82D4E6C/palettes/12.gbapal"
.incbin "data/tilesets/secondary/82D4E6C/palettes/13.gbapal"
.incbin "data/tilesets/secondary/82D4E6C/palettes/14.gbapal"
.incbin "data/tilesets/secondary/82D4E6C/palettes/15.gbapal"
gTilesetPalettes_DepartmentStore:: @ 8EA9D88
.incbin "data/tilesets/secondary/department_store/palettes/0.gbapal"
.incbin "data/tilesets/secondary/department_store/palettes/1.gbapal"
.incbin "data/tilesets/secondary/department_store/palettes/2.gbapal"
.incbin "data/tilesets/secondary/department_store/palettes/3.gbapal"
.incbin "data/tilesets/secondary/department_store/palettes/4.gbapal"
.incbin "data/tilesets/secondary/department_store/palettes/5.gbapal"
.incbin "data/tilesets/secondary/department_store/palettes/6.gbapal"
.incbin "data/tilesets/secondary/department_store/palettes/7.gbapal"
.incbin "data/tilesets/secondary/department_store/palettes/8.gbapal"
.incbin "data/tilesets/secondary/department_store/palettes/9.gbapal"
.incbin "data/tilesets/secondary/department_store/palettes/10.gbapal"
.incbin "data/tilesets/secondary/department_store/palettes/11.gbapal"
.incbin "data/tilesets/secondary/department_store/palettes/12.gbapal"
.incbin "data/tilesets/secondary/department_store/palettes/13.gbapal"
.incbin "data/tilesets/secondary/department_store/palettes/14.gbapal"
.incbin "data/tilesets/secondary/department_store/palettes/15.gbapal"
gTilesetTiles_8EA9F88:: @ 8EA9F88
.incbin "data/tilesets/secondary/82D4E6C/tiles.4bpp.lz"
gTilesetTiles_DepartmentStore:: @ 8EA9F88
.incbin "data/tilesets/secondary/department_store/tiles.4bpp.lz"
gUnionRoomChatPanelBgPal_7:: @ 8EAA9F0
.incbin "graphics/interface/union_room_chat_panel.gbapal"
data/layouts/SaffronCity_House1_1F/border.bin → data/layouts/CeladonCity_Hotel_Duplicate/border.bin
View File
data/layouts/UnusedLayout_833902C/map.bin → data/layouts/CeladonCity_Hotel_Duplicate/map.bin
View File
data/layouts/SaffronCity_House1_2F/border.bin → data/layouts/CeladonCity_Restaurant_Duplicate/border.bin
View File
data/layouts/UnusedLayout_8338E90/map.bin → data/layouts/CeladonCity_Restaurant_Duplicate/map.bin
View File
data/layouts/UnusedLayout_82D6144/border.bin → data/layouts/EverGrandeCity_HallOfFame/border.bin
View File
data/layouts/UnusedLayout_82DCA70/map.bin → data/layouts/EverGrandeCity_HallOfFame/map.bin
View File
data/layouts/UnusedLayout_82D6654/border.bin → data/layouts/FortreeCity_DecorationShop/border.bin
View File
data/layouts/UnusedLayout_82DB4F0/map.bin → data/layouts/FortreeCity_DecorationShop/map.bin
View File
data/layouts/UnusedLayout_82D672C/border.bin → data/layouts/FortreeCity_House1/border.bin
View File
data/layouts/UnusedLayout_82D7674/map.bin → data/layouts/FortreeCity_House1/map.bin
View File
data/layouts/UnusedLayout_82D75F0/border.bin → data/layouts/FortreeCity_House2/border.bin
View File
data/layouts/UnusedLayout_82D7CC8/map.bin → data/layouts/FortreeCity_House2/map.bin
View File
data/layouts/UnusedLayout_82D88C8/border.bin → data/layouts/LavaridgeTown_HerbShop/border.bin
View File
data/layouts/UnusedLayout_82D6144/map.bin → data/layouts/LavaridgeTown_HerbShop/map.bin
View File
data/layouts/UnusedLayout_82D54D8/border.bin → data/layouts/LittlerootTown_MaysHouse_2F/border.bin
View File
data/layouts/UnusedLayout_82D54D8/map.bin → data/layouts/LittlerootTown_MaysHouse_2F/map.bin
View File
data/layouts/UnusedLayout_82DCA70/border.bin → data/layouts/MossdeepCity_EReaderTrainerHouse_1F/border.bin
View File
data/layouts/UnusedLayout_82DCB44/map.bin → data/layouts/MossdeepCity_EReaderTrainerHouse_1F/map.bin
View File
data/layouts/UnusedLayout_82DCB44/border.bin → data/layouts/MossdeepCity_EReaderTrainerHouse_2F/border.bin
View File
data/layouts/UnusedLayout_82DCC40/map.bin → data/layouts/MossdeepCity_EReaderTrainerHouse_2F/map.bin
View File
data/layouts/UnusedLayout_82D7674/border.bin → data/layouts/PacifidlogTown_House1/border.bin
View File
data/layouts/UnusedLayout_82D6654/map.bin → data/layouts/PacifidlogTown_House1/map.bin
View File
data/layouts/UnusedLayout_82D7CC8/border.bin → data/layouts/PacifidlogTown_House2/border.bin
View File
data/layouts/UnusedLayout_82D672C/map.bin → data/layouts/PacifidlogTown_House2/map.bin
View File
data/layouts/UnknownMap_03_50/border.bin → data/layouts/Prototype_SeviiIsle_22/border.bin
View File
data/layouts/UnusedLayout_833614C/map.bin → data/layouts/Prototype_SeviiIsle_22/map.bin
View File
data/layouts/UnknownMap_03_51/border.bin → data/layouts/Prototype_SeviiIsle_23_East/border.bin
View File
data/layouts/UnusedLayout_83377F0/map.bin → data/layouts/Prototype_SeviiIsle_23_East/map.bin
View File
data/layouts/UnknownMap_03_52/border.bin → data/layouts/Prototype_SeviiIsle_23_West/border.bin
View File
data/layouts/UnusedLayout_8338354/map.bin → data/layouts/Prototype_SeviiIsle_23_West/map.bin
View File
data/layouts/UnknownMap_03_53/border.bin → data/layouts/Prototype_SeviiIsle_24/border.bin
View File
data/layouts/UnusedLayout_8338738/map.bin → data/layouts/Prototype_SeviiIsle_24/map.bin
View File
data/layouts/UnusedLayout_833614C/border.bin → data/layouts/Prototype_SeviiIsle_6/border.bin
View File
data/layouts/UnknownMap_03_50/map.bin → data/layouts/Prototype_SeviiIsle_6/map.bin
View File
data/layouts/UnusedLayout_83377F0/border.bin → data/layouts/Prototype_SeviiIsle_7/border.bin
View File
data/layouts/UnknownMap_03_51/map.bin → data/layouts/Prototype_SeviiIsle_7/map.bin
View File
data/layouts/UnusedLayout_8338354/border.bin → data/layouts/Prototype_SeviiIsle_8/border.bin
View File
data/layouts/UnknownMap_03_52/map.bin → data/layouts/Prototype_SeviiIsle_8/map.bin
View File
data/layouts/UnusedLayout_8338738/border.bin → data/layouts/Prototype_SeviiIsle_9/border.bin
View File
data/layouts/UnknownMap_03_53/map.bin → data/layouts/Prototype_SeviiIsle_9/map.bin
View File
data/layouts/UnusedLayout_82DBBE0/border.bin → data/layouts/RS_BattleTower/border.bin
View File
data/layouts/UnusedLayout_82DBBE0/map.bin → data/layouts/RS_BattleTower/map.bin
View File
data/layouts/UnusedLayout_82D6490/border.bin → data/layouts/RS_PokemonCenter_1F/border.bin
View File
data/layouts/UnusedLayout_82D6490/map.bin → data/layouts/RS_PokemonCenter_1F/map.bin
View File
data/layouts/UnusedLayout_82DCC40/border.bin → data/layouts/RS_SafariZone_Entrance/border.bin
View File
data/layouts/UnusedLayout_82D88C8/map.bin → data/layouts/RS_SafariZone_Entrance/map.bin
View File
data/layouts/UnusedLayout_82D9B24/border.bin → data/layouts/RS_SafariZone_Northeast/border.bin
View File
data/layouts/UnusedLayout_82D9B24/map.bin → data/layouts/RS_SafariZone_Northeast/map.bin
View File
data/layouts/UnusedLayout_82DD0DC/border.bin → data/layouts/RS_SafariZone_RestHouse/border.bin
View File
data/layouts/UnusedLayout_82DD0DC/map.bin → data/layouts/RS_SafariZone_RestHouse/map.bin
View File
data/layouts/UnusedLayout_82DA7C8/border.bin → data/layouts/RS_SafariZone_Southeast/border.bin
View File
data/layouts/UnusedLayout_82DB46C/map.bin → data/layouts/RS_SafariZone_Southeast/map.bin
View File
data/layouts/UnusedLayout_82DB46C/border.bin → data/layouts/RS_SafariZone_Southwest/border.bin
View File
data/layouts/UnusedLayout_82DA7C8/map.bin → data/layouts/RS_SafariZone_Southwest/map.bin
View File
data/layouts/UnusedLayout_82DB4F0/border.bin → data/layouts/RustboroCity_CuttersHouse/border.bin
View File
data/layouts/UnusedLayout_82D75F0/map.bin → data/layouts/RustboroCity_CuttersHouse/map.bin
View File
data/layouts/UnusedLayout_82DBDD8/border.bin → data/layouts/RustboroCity_Flat1_1F/border.bin
View File
data/layouts/UnusedLayout_82DCF00/map.bin → data/layouts/RustboroCity_Flat1_1F/map.bin
View File
data/layouts/UnusedLayout_82DBFB8/border.bin → data/layouts/RustboroCity_Flat1_2F/border.bin
View File
data/layouts/UnusedLayout_82DD004/map.bin → data/layouts/RustboroCity_Flat1_2F/map.bin
View File
data/layouts/UnusedLayout_82DC4EC/border.bin → data/layouts/RustboroCity_Flat2_1F/border.bin
View File
data/layouts/UnusedLayout_82DC60C/map.bin → data/layouts/RustboroCity_Flat2_1F/map.bin
View File
data/layouts/UnusedLayout_82DC60C/border.bin → data/layouts/RustboroCity_Flat2_2F/border.bin
View File
data/layouts/UnusedLayout_82DC72C/map.bin → data/layouts/RustboroCity_Flat2_2F/map.bin
View File
data/layouts/UnusedLayout_82DC72C/border.bin → data/layouts/RustboroCity_Flat2_3F/border.bin
View File
data/layouts/UnusedLayout_82DC84C/map.bin → data/layouts/RustboroCity_Flat2_3F/map.bin
View File
data/layouts/UnusedLayout_82DC84C/border.bin → data/layouts/SSTidal_Corridor/border.bin
View File
data/layouts/UnusedLayout_82DBDD8/map.bin → data/layouts/SSTidal_Corridor/map.bin
View File
data/layouts/UnusedLayout_82DCCD4/border.bin → data/layouts/SSTidal_LowerDeck/border.bin
View File

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