From 154c44250512828d56f5431188a7907cd149ef10 Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Tue, 25 Jan 2022 22:46:40 -0500 Subject: Decomped CanMoveInDirection() --- data/data_8106A4C.s | 35 ----------------------------------- data/data_8106FB5.s | 31 +++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 35 deletions(-) create mode 100644 data/data_8106FB5.s (limited to 'data') diff --git a/data/data_8106A4C.s b/data/data_8106A4C.s index 902cb73..d8e604b 100644 --- a/data/data_8106A4C.s +++ b/data/data_8106A4C.s @@ -362,38 +362,3 @@ gUnknown_8106F7C: @ 8106F7C .global gUnknown_8106FA4 gUnknown_8106FA4: @ 8106FA4 .string "{COLOR_2}%c%s{END_COLOR_TEXT_2}\0" - - .global gDirectionBitMasks -gDirectionBitMasks: @ 8106FAD -@ replacing .incbin "baserom.gba", 0x00106fad, 0x8 - .byte 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80 - - .global gUnknown_8106FB5 -gUnknown_8106FB5: @ 8106FB5 -@ replacing .incbin "baserom.gba", 0x00106fb5, 0x8 - .byte 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80 - - .global gUnknown_8106FBD -gUnknown_8106FBD: @ 8106FBD -@ replacing .incbin "baserom.gba", 0x00106fbd, 0x8 - .byte 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80 - - .global gUnknown_8106FC5 -gUnknown_8106FC5: @ 8106FC5 -@ replacing .incbin "baserom.gba", 0x00106fc5, 0x8 - .byte 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80 - - .global gUnknown_8106FCD -gUnknown_8106FCD: @ 8106FCD -@ replacing .incbin "baserom.gba", 0x00106fcd, 0x8 - .byte 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80 - - .global gDirectionBitMasks_2 -gDirectionBitMasks_2: @ 8106FD5 -@ replacing .incbin "baserom.gba", 0x00106fd5, 0x8 - .byte 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80 - - .global gDirectionBitMasks_3 -gDirectionBitMasks_3: @ 8106FDD -@ replacing .incbin "baserom.gba", 0x00106fdd, 0x8 - .byte 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80 diff --git a/data/data_8106FB5.s b/data/data_8106FB5.s new file mode 100644 index 0000000..dc32b18 --- /dev/null +++ b/data/data_8106FB5.s @@ -0,0 +1,31 @@ + .section .rodata + + .global gUnknown_8106FB5 +gUnknown_8106FB5: @ 8106FB5 +@ replacing .incbin "baserom.gba", 0x00106fb5, 0x8 + .byte 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80 + + .global gUnknown_8106FBD +gUnknown_8106FBD: @ 8106FBD +@ replacing .incbin "baserom.gba", 0x00106fbd, 0x8 + .byte 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80 + + .global gUnknown_8106FC5 +gUnknown_8106FC5: @ 8106FC5 +@ replacing .incbin "baserom.gba", 0x00106fc5, 0x8 + .byte 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80 + + .global gUnknown_8106FCD +gUnknown_8106FCD: @ 8106FCD +@ replacing .incbin "baserom.gba", 0x00106fcd, 0x8 + .byte 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80 + + .global gDirectionBitMasks_2 +gDirectionBitMasks_2: @ 8106FD5 +@ replacing .incbin "baserom.gba", 0x00106fd5, 0x8 + .byte 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80 + + .global gDirectionBitMasks_3 +gDirectionBitMasks_3: @ 8106FDD +@ replacing .incbin "baserom.gba", 0x00106fdd, 0x8 + .byte 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80 -- cgit v1.2.3 From 5dc5b3b1f97f9467005dadd63f5f6e052f984bc3 Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Wed, 26 Jan 2022 00:07:18 -0500 Subject: Used official or more common names for music tracks --- data/cutscenes_1.s | 2 +- data/scripts/personality_test.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/cutscenes_1.s b/data/cutscenes_1.s index 096fae4..2c76b68 100644 --- a/data/cutscenes_1.s +++ b/data/cutscenes_1.s @@ -9080,7 +9080,7 @@ .byte 0xf6, 0x00, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0xdb, 0x26, 0x08 changeTileSet 0xDE .byte 0x0c, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - playMusic MUS_IN_THE_DEPTHS_OF_PIT + playMusic MUS_IN_THE_DEPTHS_OF_THE_PIT .byte 0x22, 0x01, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 waitFlag 3 fadeMusicOut 0x78 diff --git a/data/scripts/personality_test.inc b/data/scripts/personality_test.inc index e6de4a1..ae7cd06 100644 --- a/data/scripts/personality_test.inc +++ b/data/scripts/personality_test.inc @@ -27,7 +27,7 @@ floatingText InterviewBegin_826E108 closeTextBox StartSceneRunCall 0 - playMusic MUS_WELCOME_TO_WORLD_POKEMON + playMusic MUS_WELCOME_TO_THE_WORLD_OF_POKEMON .byte 0x22, 0x01, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x3c, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 fadeMusicOut 0x1E -- cgit v1.2.3