dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into dump_pointers

Browse Source
This commit is contained in:
DizzyEggg
2017-12-22 16:22:16 +01:00
parent 19c25a8f2b 841ee0f2b2
commit cddd44834e
1390 changed files with 527546 additions and 19712 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+11 -3
View File
@@ -9,10 +9,12 @@ MAP = $(ROM:.gba=.map)
C_SUBDIR = src C_SUBDIR = src
ASM_SUBDIR = asm ASM_SUBDIR = asm
DATA_ASM_SUBDIR = data DATA_ASM_SUBDIR = data
SONG_SUBDIR = sound/songs
C_BUILDDIR = $(OBJ_DIR)/$(C_SUBDIR) C_BUILDDIR = $(OBJ_DIR)/$(C_SUBDIR)
ASM_BUILDDIR = $(OBJ_DIR)/$(ASM_SUBDIR) ASM_BUILDDIR = $(OBJ_DIR)/$(ASM_SUBDIR)
DATA_ASM_BUILDDIR = $(OBJ_DIR)/$(DATA_ASM_SUBDIR) DATA_ASM_BUILDDIR = $(OBJ_DIR)/$(DATA_ASM_SUBDIR)
SONG_BUILDDIR = $(OBJ_DIR)/$(SONG_SUBDIR)
AS := $(DEVKITARM)/bin/arm-none-eabi-as AS := $(DEVKITARM)/bin/arm-none-eabi-as
ASFLAGS := -mcpu=arm7tdmi ASFLAGS := -mcpu=arm7tdmi
@@ -49,7 +51,7 @@ RAMSCRGEN := tools/ramscrgen/ramscrgen
.PHONY: rom clean compare tidy .PHONY: rom clean compare tidy
$(shell mkdir -p $(C_BUILDDIR) $(ASM_BUILDDIR) $(DATA_ASM_BUILDDIR)) $(shell mkdir -p $(C_BUILDDIR) $(ASM_BUILDDIR) $(DATA_ASM_BUILDDIR) $(SONG_BUILDDIR))
C_SRCS := $(wildcard $(C_SUBDIR)/*.c) C_SRCS := $(wildcard $(C_SUBDIR)/*.c)
C_OBJS := $(patsubst $(C_SUBDIR)/%.c,$(C_BUILDDIR)/%.o,$(C_SRCS)) C_OBJS := $(patsubst $(C_SUBDIR)/%.c,$(C_BUILDDIR)/%.o,$(C_SRCS))
@@ -60,7 +62,10 @@ ASM_OBJS := $(patsubst $(ASM_SUBDIR)/%.s,$(ASM_BUILDDIR)/%.o,$(ASM_SRCS))
DATA_ASM_SRCS := $(wildcard $(DATA_ASM_SUBDIR)/*.s) DATA_ASM_SRCS := $(wildcard $(DATA_ASM_SUBDIR)/*.s)
DATA_ASM_OBJS := $(patsubst $(DATA_ASM_SUBDIR)/%.s,$(DATA_ASM_BUILDDIR)/%.o,$(DATA_ASM_SRCS)) DATA_ASM_OBJS := $(patsubst $(DATA_ASM_SUBDIR)/%.s,$(DATA_ASM_BUILDDIR)/%.o,$(DATA_ASM_SRCS))
OBJS := $(C_OBJS) $(ASM_OBJS) $(DATA_ASM_OBJS) SONG_SRCS := $(wildcard $(SONG_SUBDIR)/*.s)
SONG_OBJS := $(patsubst $(SONG_SUBDIR)/%.s,$(SONG_BUILDDIR)/%.o,$(SONG_SRCS))
OBJS := $(C_OBJS) $(ASM_OBJS) $(DATA_ASM_OBJS) $(SONG_OBJS)
OBJS_REL := $(patsubst $(OBJ_DIR)/%,%,$(OBJS)) OBJS_REL := $(patsubst $(OBJ_DIR)/%,%,$(OBJS))
rom: $(ROM) rom: $(ROM)
@@ -132,6 +137,9 @@ endif
$(DATA_ASM_BUILDDIR)/%.o: $(DATA_ASM_SUBDIR)/%.s $$(data_dep) $(DATA_ASM_BUILDDIR)/%.o: $(DATA_ASM_SUBDIR)/%.s $$(data_dep)
$(PREPROC) $< charmap.txt | $(CPP) -I include | $(AS) $(ASFLAGS) -o $@ $(PREPROC) $< charmap.txt | $(CPP) -I include | $(AS) $(ASFLAGS) -o $@
$(SONG_BUILDDIR)/%.o: $(SONG_SUBDIR)/%.s
$(AS) $(ASFLAGS) -I sound -o $@ $<
$(OBJ_DIR)/sym_bss.ld: sym_bss.txt $(OBJ_DIR)/sym_bss.ld: sym_bss.txt
$(RAMSCRGEN) .bss $< ENGLISH > $@ $(RAMSCRGEN) .bss $< ENGLISH > $@
@@ -142,7 +150,7 @@ $(OBJ_DIR)/sym_ewram.ld: sym_ewram.txt
$(RAMSCRGEN) ewram_data $< ENGLISH > $@ $(RAMSCRGEN) ewram_data $< ENGLISH > $@
$(OBJ_DIR)/ld_script.ld: ld_script.txt $(OBJ_DIR)/sym_bss.ld $(OBJ_DIR)/sym_common.ld $(OBJ_DIR)/sym_ewram.ld $(OBJ_DIR)/ld_script.ld: ld_script.txt $(OBJ_DIR)/sym_bss.ld $(OBJ_DIR)/sym_common.ld $(OBJ_DIR)/sym_ewram.ld
cd $(OBJ_DIR) && sed -f ../../ld_script.sed ../../$< | sed "s#tools/#../../tools/#g" | sed "s#sound/#../../sound/#g" > ld_script.ld cd $(OBJ_DIR) && sed -f ../../ld_script.sed ../../$< | sed "s#tools/#../../tools/#g" > ld_script.ld
$(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS) $(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS)
cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ $(OBJS_REL) ../../$(LIBGCC) cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ $(OBJS_REL) ../../$(LIBGCC)
asm/berry_tag_screen.s
+2 -2
View File
@@ -115,7 +115,7 @@ _08177CD8:
.4byte _08177DC2 .4byte _08177DC2
_08177D18: _08177D18:
bl SetVBlankHBlankCallbacksToNull bl SetVBlankHBlankCallbacksToNull
bl sub_8121DA0 bl ResetVramOamAndBgCntRegs
bl clear_scheduled_bg_copies_to_vram bl clear_scheduled_bg_copies_to_vram
b _08177DDC b _08177DDC
_08177D26: _08177D26:
@@ -246,7 +246,7 @@ sub_8177E14: @ 8177E14
adds r1, r0 adds r1, r0
movs r0, 0x3 movs r0, 0x3
bl SetBgTilemapBuffer bl SetBgTilemapBuffer
bl sub_8121E10 bl ResetAllBgsCoordinates
movs r0, 0x2 movs r0, 0x2
bl schedule_bg_copy_tilemap_to_vram bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x3 movs r0, 0x3
asm/item_menu.s
+18 -18
View File
@@ -463,7 +463,7 @@ _081AAF54:
adds r5, r0, 0 adds r5, r0, 0
lsls r5, 24 lsls r5, 24
lsrs r5, 24 lsrs r5, 24
ldr r0, =gUnknown_03006310 ldr r0, =gMultiuseListMenuTemplate
ldrb r2, [r4, 0x5] ldrb r2, [r4, 0x5]
lsls r2, 1 lsls r2, 1
adds r1, r4, 0 adds r1, r4, 0
@@ -568,7 +568,7 @@ _081AB046:
thumb_func_start bag_menu_init_bgs thumb_func_start bag_menu_init_bgs
bag_menu_init_bgs: @ 81AB050 bag_menu_init_bgs: @ 81AB050
push {r4,lr} push {r4,lr}
bl sub_8121DA0 bl ResetVramOamAndBgCntRegs
ldr r4, =gUnknown_0203CE54 ldr r4, =gUnknown_0203CE54
ldr r0, [r4] ldr r0, [r4]
adds r0, 0x4 adds r0, 0x4
@@ -586,7 +586,7 @@ bag_menu_init_bgs: @ 81AB050
adds r1, 0x4 adds r1, 0x4
movs r0, 0x2 movs r0, 0x2
bl SetBgTilemapBuffer bl SetBgTilemapBuffer
bl sub_8121E10 bl ResetAllBgsCoordinates
movs r0, 0x2 movs r0, 0x2
bl schedule_bg_copy_tilemap_to_vram bl schedule_bg_copy_tilemap_to_vram
movs r1, 0x82 movs r1, 0x82
@@ -719,7 +719,7 @@ _081AB1B2:
b _081AB1E4 b _081AB1E4
.pool .pool
_081AB1CC: _081AB1CC:
bl sub_8122328 bl LoadListMenuArrowsGfx
ldr r0, [r4] ldr r0, [r4]
ldr r1, =0x00000834 ldr r1, =0x00000834
adds r0, r1 adds r0, r1
@@ -902,7 +902,7 @@ _081AB30C:
cmp r6, r0 cmp r6, r0
bcc _081AB30C bcc _081AB30C
_081AB34A: _081AB34A:
ldr r2, =gUnknown_03006310 ldr r2, =gMultiuseListMenuTemplate
adds r1, r2, 0 adds r1, r2, 0
ldr r0, =gUnknown_08613F9C ldr r0, =gUnknown_08613F9C
ldm r0!, {r3-r5} ldm r0!, {r3-r5}
@@ -1924,7 +1924,7 @@ bag_menu_inits_lists_menu: @ 81ABBBC
bl sub_81ABA88 bl sub_81ABA88
ldrb r0, [r7, 0x5] ldrb r0, [r7, 0x5]
bl load_bag_item_list_buffers bl load_bag_item_list_buffers
ldr r0, =gUnknown_03006310 ldr r0, =gMultiuseListMenuTemplate
mov r2, r8 mov r2, r8
ldrh r1, [r2] ldrh r1, [r2]
ldrh r2, [r4] ldrh r2, [r4]
@@ -2133,7 +2133,7 @@ _081ABDCC:
ldrb r0, [r6] ldrb r0, [r6]
adds r1, r7, 0 adds r1, r7, 0
mov r2, r8 mov r2, r8
bl get_coro_args_x18_x1A bl sub_81AE860
ldrh r2, [r7] ldrh r2, [r7]
mov r3, r8 mov r3, r8
ldrh r0, [r3] ldrh r0, [r3]
@@ -2157,12 +2157,12 @@ _081ABDCC:
.pool .pool
_081ABE10: _081ABE10:
ldrb r0, [r6] ldrb r0, [r6]
bl ListMenuHandleInput bl ListMenuHandleInputGetItemId
adds r4, r0, 0 adds r4, r0, 0
ldrb r0, [r6] ldrb r0, [r6]
adds r1, r7, 0 adds r1, r7, 0
mov r2, r8 mov r2, r8
bl get_coro_args_x18_x1A bl sub_81AE860
movs r0, 0x2 movs r0, 0x2
negs r0, r0 negs r0, r0
cmp r4, r0 cmp r4, r0
@@ -2603,7 +2603,7 @@ _081AC1DC:
subs r5, r4, 0x5 subs r5, r4, 0x5
ldrb r0, [r5, 0x5] ldrb r0, [r5, 0x5]
bl load_bag_item_list_buffers bl load_bag_item_list_buffers
ldr r0, =gUnknown_03006310 ldr r0, =gMultiuseListMenuTemplate
ldrb r2, [r5, 0x5] ldrb r2, [r5, 0x5]
lsls r2, 1 lsls r2, 1
adds r1, r4, 0 adds r1, r4, 0
@@ -2847,12 +2847,12 @@ sub_81AC3C0: @ 81AC3C0
adds r1, r2, r1 adds r1, r2, r1
adds r3, 0x8 adds r3, 0x8
adds r2, r3 adds r2, r3
bl get_coro_args_x18_x1A bl sub_81AE860
b _081AC472 b _081AC472
.pool .pool
_081AC418: _081AC418:
ldrb r0, [r4] ldrb r0, [r4]
bl ListMenuHandleInput bl ListMenuHandleInputGetItemId
adds r7, r0, 0 adds r7, r0, 0
ldrb r0, [r4] ldrb r0, [r4]
ldr r5, =gUnknown_0203CE58 ldr r5, =gUnknown_0203CE58
@@ -2864,7 +2864,7 @@ _081AC418:
adds r4, r5, 0 adds r4, r5, 0
adds r4, 0x8 adds r4, 0x8
adds r2, r4 adds r2, r4
bl get_coro_args_x18_x1A bl sub_81AE860
movs r0, 0 movs r0, 0
bl sub_80D4FC8 bl sub_80D4FC8
ldrb r0, [r5, 0x5] ldrb r0, [r5, 0x5]
@@ -2989,7 +2989,7 @@ _081AC4F8:
_081AC538: _081AC538:
ldrb r0, [r5, 0x5] ldrb r0, [r5, 0x5]
bl load_bag_item_list_buffers bl load_bag_item_list_buffers
ldr r0, =gUnknown_03006310 ldr r0, =gMultiuseListMenuTemplate
mov r2, r8 mov r2, r8
ldrh r1, [r2] ldrh r1, [r2]
ldrh r2, [r7] ldrh r2, [r7]
@@ -3070,7 +3070,7 @@ sub_81AC590: @ 81AC590
_081AC5F2: _081AC5F2:
ldrb r0, [r4, 0x5] ldrb r0, [r4, 0x5]
bl load_bag_item_list_buffers bl load_bag_item_list_buffers
ldr r0, =gUnknown_03006310 ldr r0, =gMultiuseListMenuTemplate
ldrh r1, [r6] ldrh r1, [r6]
ldrh r2, [r5] ldrh r2, [r5]
bl ListMenuInit bl ListMenuInit
@@ -4326,7 +4326,7 @@ Task_ActuallyToss: @ 81AD150
bl sub_81ABA88 bl sub_81ABA88
ldrb r0, [r4, 0x5] ldrb r0, [r4, 0x5]
bl load_bag_item_list_buffers bl load_bag_item_list_buffers
ldr r0, =gUnknown_03006310 ldr r0, =gMultiuseListMenuTemplate
mov r2, r8 mov r2, r8
ldrh r1, [r2] ldrh r1, [r2]
ldrh r2, [r7] ldrh r2, [r7]
@@ -4388,7 +4388,7 @@ _081AD23A:
ldr r0, =gUnknown_0203CE58 ldr r0, =gUnknown_0203CE58
ldrb r0, [r0, 0x5] ldrb r0, [r0, 0x5]
bl load_bag_item_list_buffers bl load_bag_item_list_buffers
ldr r0, =gUnknown_03006310 ldr r0, =gMultiuseListMenuTemplate
ldrh r1, [r6] ldrh r1, [r6]
ldrh r2, [r5] ldrh r2, [r5]
bl ListMenuInit bl ListMenuInit
@@ -5155,7 +5155,7 @@ sub_81AD8C8: @ 81AD8C8
bl sub_81ABA88 bl sub_81ABA88
ldrb r0, [r7, 0x5] ldrb r0, [r7, 0x5]
bl load_bag_item_list_buffers bl load_bag_item_list_buffers
ldr r0, =gUnknown_03006310 ldr r0, =gMultiuseListMenuTemplate
mov r2, r9 mov r2, r9
ldrh r1, [r2] ldrh r1, [r2]
ldrh r2, [r5] ldrh r2, [r5]
asm/item_use.s
+2 -2
View File
@@ -1497,7 +1497,7 @@ sub_80FDBEC: @ 80FDBEC
push {lr} push {lr}
ldr r1, =bag_menu_mail_related ldr r1, =bag_menu_mail_related
movs r0, 0 movs r0, 0
bl sub_81357FC bl OpenPokeblockCase
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
@@ -1517,7 +1517,7 @@ sub_80FDC00: @ 80FDC00
bl overworld_free_bg_tilemaps bl overworld_free_bg_tilemaps
ldr r1, =c2_exit_to_overworld_2_switch ldr r1, =c2_exit_to_overworld_2_switch
movs r0, 0 movs r0, 0
bl sub_81357FC bl OpenPokeblockCase
adds r0, r4, 0 adds r0, r4, 0
bl DestroyTask bl DestroyTask
_080FDC24: _080FDC24:
asm/learn_move.s
+6 -6
View File
@@ -94,7 +94,7 @@ sub_81606A0: @ 81606A0
ldr r0, =gUnknown_085CEBB8 ldr r0, =gUnknown_085CEBB8
bl LoadSpritePalette bl LoadSpritePalette
bl sub_81610B8 bl sub_81610B8
ldr r0, =gUnknown_03006310 ldr r0, =gMultiuseListMenuTemplate
ldrh r1, [r4] ldrh r1, [r4]
ldrh r2, [r4, 0x2] ldrh r2, [r4, 0x2]
bl ListMenuInit bl ListMenuInit
@@ -151,7 +151,7 @@ sub_8160740: @ 8160740
ldr r0, =gUnknown_085CEBB8 ldr r0, =gUnknown_085CEBB8
bl LoadSpritePalette bl LoadSpritePalette
bl sub_81610B8 bl sub_81610B8
ldr r0, =gUnknown_03006310 ldr r0, =gMultiuseListMenuTemplate
ldrh r1, [r4] ldrh r1, [r4]
ldrh r2, [r4, 0x2] ldrh r2, [r4, 0x2]
bl ListMenuInit bl ListMenuInit
@@ -175,14 +175,14 @@ sub_8160740: @ 8160740
thumb_func_start sub_81607EC thumb_func_start sub_81607EC
sub_81607EC: @ 81607EC sub_81607EC: @ 81607EC
push {lr} push {lr}
bl sub_8121DA0 bl ResetVramOamAndBgCntRegs
movs r0, 0 movs r0, 0
bl ResetBgsAndClearDma3BusyFlags bl ResetBgsAndClearDma3BusyFlags
ldr r1, =gUnknown_085CEC28 ldr r1, =gUnknown_085CEC28
movs r0, 0 movs r0, 0
movs r2, 0x2 movs r2, 0x2
bl InitBgsFromTemplates bl InitBgsFromTemplates
bl sub_8121E10 bl ResetAllBgsCoordinates
movs r1, 0x82 movs r1, 0x82
lsls r1, 5 lsls r1, 5
movs r0, 0 movs r0, 0
@@ -980,7 +980,7 @@ sub_8160F50: @ 8160F50
lsls r4, 1 lsls r4, 1
adds r0, r4 adds r0, r4
ldrb r0, [r0] ldrb r0, [r0]
bl ListMenuHandleInput bl ListMenuHandleInputGetItemId
adds r5, r0, 0 adds r5, r0, 0
ldr r0, [r6] ldr r0, [r6]
adds r0, r4 adds r0, r4
@@ -988,7 +988,7 @@ sub_8160F50: @ 8160F50
ldr r4, =gUnknown_0203BC38 ldr r4, =gUnknown_0203BC38
adds r2, r4, 0x2 adds r2, r4, 0x2
adds r1, r4, 0 adds r1, r4, 0
bl get_coro_args_x18_x1A bl sub_81AE860
movs r0, 0x2 movs r0, 0x2
negs r0, r0 negs r0, r0
cmp r5, r0 cmp r5, r0
asm/link.s
+16 -16
View File
@@ -18243,7 +18243,7 @@ _08012938:
ldrb r0, [r6, 0xF] ldrb r0, [r6, 0xF]
movs r1, 0 movs r1, 0
bl sub_81973FC bl sub_81973FC
ldr r0, =gUnknown_03006310 ldr r0, =gMultiuseListMenuTemplate
adds r2, r0, 0 adds r2, r0, 0
ldr r1, =gUnknown_082F015C ldr r1, =gUnknown_082F015C
ldm r1!, {r3,r5,r7} ldm r1!, {r3,r5,r7}
@@ -19724,7 +19724,7 @@ _0801360C:
ldrb r0, [r6, 0xB] ldrb r0, [r6, 0xB]
movs r1, 0 movs r1, 0
bl sub_81973FC bl sub_81973FC
ldr r0, =gUnknown_03006310 ldr r0, =gMultiuseListMenuTemplate
adds r2, r0, 0 adds r2, r0, 0
ldr r1, =gUnknown_082F0204 ldr r1, =gUnknown_082F0204
ldm r1!, {r3,r5,r7} ldm r1!, {r3,r5,r7}
@@ -19769,7 +19769,7 @@ _080136EA:
b _08013A72 b _08013A72
_080136F2: _080136F2:
ldrb r0, [r6, 0xE] ldrb r0, [r6, 0xE]
bl ListMenuHandleInput bl ListMenuHandleInputGetItemId
adds r4, r0, 0 adds r4, r0, 0
ldr r0, =gMain ldr r0, =gMain
ldrh r1, [r0, 0x2E] ldrh r1, [r0, 0x2E]
@@ -21038,7 +21038,7 @@ sub_8014210: @ 8014210
adds r6, r0, 0 adds r6, r0, 0
lsls r6, 16 lsls r6, 16
lsrs r6, 16 lsrs r6, 16
bl sp000_heal_pokemon bl HealPlayerParty
bl copy_player_party_to_sav1 bl copy_player_party_to_sav1
bl copy_bags_and_unk_data_from_save_blocks bl copy_bags_and_unk_data_from_save_blocks
ldr r5, =gLinkPlayers ldr r5, =gLinkPlayers
@@ -21406,7 +21406,7 @@ _080145F4:
ldr r0, =gBlockSendBuffer ldr r0, =gBlockSendBuffer
movs r1, 0x1 movs r1, 0x1
bl sub_80143E4 bl sub_80143E4
bl sp000_heal_pokemon bl HealPlayerParty
bl copy_player_party_to_sav1 bl copy_player_party_to_sav1
bl copy_bags_and_unk_data_from_save_blocks bl copy_bags_and_unk_data_from_save_blocks
movs r0, 0x1 movs r0, 0x1
@@ -21419,7 +21419,7 @@ _080145F4:
.pool .pool
_08014620: _08014620:
bl overworld_free_bg_tilemaps bl overworld_free_bg_tilemaps
bl sp000_heal_pokemon bl HealPlayerParty
bl copy_player_party_to_sav1 bl copy_player_party_to_sav1
bl copy_bags_and_unk_data_from_save_blocks bl copy_bags_and_unk_data_from_save_blocks
ldr r0, =gBlockSendBuffer ldr r0, =gBlockSendBuffer
@@ -21435,7 +21435,7 @@ _08014620:
.pool .pool
_0801464C: _0801464C:
bl overworld_free_bg_tilemaps bl overworld_free_bg_tilemaps
bl sp000_heal_pokemon bl HealPlayerParty
bl copy_player_party_to_sav1 bl copy_player_party_to_sav1
bl copy_bags_and_unk_data_from_save_blocks bl copy_bags_and_unk_data_from_save_blocks
ldr r0, =gBlockSendBuffer ldr r0, =gBlockSendBuffer
@@ -21969,7 +21969,7 @@ _08014AEC:
strb r0, [r5, 0xF] strb r0, [r5, 0xF]
ldrb r0, [r5, 0xF] ldrb r0, [r5, 0xF]
bl sub_8018784 bl sub_8018784
ldr r0, =gUnknown_03006310 ldr r0, =gMultiuseListMenuTemplate
adds r2, r0, 0 adds r2, r0, 0
ldr r1, =gUnknown_082F015C ldr r1, =gUnknown_082F015C
ldm r1!, {r3,r4,r6} ldm r1!, {r3,r4,r6}
@@ -22501,7 +22501,7 @@ _08014FE8:
strb r0, [r7, 0xD] strb r0, [r7, 0xD]
ldrb r0, [r7, 0xB] ldrb r0, [r7, 0xB]
bl sub_8018784 bl sub_8018784
ldr r0, =gUnknown_03006310 ldr r0, =gMultiuseListMenuTemplate
adds r2, r0, 0 adds r2, r0, 0
ldr r1, =gUnknown_082F0204 ldr r1, =gUnknown_082F0204
ldm r1!, {r3-r5} ldm r1!, {r3-r5}
@@ -22549,7 +22549,7 @@ _080150CE:
b _080152A0 b _080152A0
_080150D6: _080150D6:
ldrb r0, [r7, 0xE] ldrb r0, [r7, 0xE]
bl ListMenuHandleInput bl ListMenuHandleInputGetItemId
adds r2, r0, 0 adds r2, r0, 0
ldr r0, =gMain ldr r0, =gMain
ldrh r1, [r0, 0x2E] ldrh r1, [r0, 0x2E]
@@ -22874,7 +22874,7 @@ _08015398:
strb r0, [r5, 0xB] strb r0, [r5, 0xB]
ldrb r0, [r5, 0xB] ldrb r0, [r5, 0xB]
bl sub_8018784 bl sub_8018784
ldr r0, =gUnknown_03006310 ldr r0, =gMultiuseListMenuTemplate
adds r2, r0, 0 adds r2, r0, 0
ldr r1, =gUnknown_082F0204 ldr r1, =gUnknown_082F0204
ldm r1!, {r3,r4,r6} ldm r1!, {r3,r4,r6}
@@ -22920,7 +22920,7 @@ _08015446:
cmp r0, 0 cmp r0, 0
beq _08015452 beq _08015452
ldrb r0, [r5, 0xE] ldrb r0, [r5, 0xE]
bl ListMenuHandleInput bl ListMenuHandleInputGetItemId
_08015452: _08015452:
ldrb r0, [r5, 0x14] ldrb r0, [r5, 0x14]
cmp r0, 0x78 cmp r0, 0x78
@@ -26270,7 +26270,7 @@ _080171DC:
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0 movs r1, 0
bl sub_81973FC bl sub_81973FC
ldr r0, =gUnknown_03006310 ldr r0, =gMultiuseListMenuTemplate
adds r2, r0, 0 adds r2, r0, 0
ldr r1, [sp, 0x24] ldr r1, [sp, 0x24]
ldm r1!, {r3,r4,r6} ldm r1!, {r3,r4,r6}
@@ -26295,7 +26295,7 @@ _080171DC:
_08017228: _08017228:
mov r3, r9 mov r3, r9
ldrb r0, [r3] ldrb r0, [r3]
bl ListMenuHandleInput bl ListMenuHandleInputGetItemId
mov r8, r0 mov r8, r0
ldr r0, =gMain ldr r0, =gMain
ldrh r1, [r0, 0x2E] ldrh r1, [r0, 0x2E]
@@ -26383,7 +26383,7 @@ _080172C8:
ldrb r0, [r6] ldrb r0, [r6]
movs r1, 0 movs r1, 0
bl sub_81973FC bl sub_81973FC
ldr r0, =gUnknown_03006310 ldr r0, =gMultiuseListMenuTemplate
adds r2, r0, 0 adds r2, r0, 0
ldr r1, [sp, 0x24] ldr r1, [sp, 0x24]
ldm r1!, {r3,r4,r7} ldm r1!, {r3,r4,r7}
@@ -26411,7 +26411,7 @@ _08017314:
_0801731C: _0801731C:
mov r3, r10 mov r3, r10
ldrb r0, [r3] ldrb r0, [r3]
bl ListMenuHandleInput bl ListMenuHandleInputGetItemId
adds r1, r0, 0 adds r1, r0, 0
ldr r0, =gMain ldr r0, =gMain
ldrh r2, [r0, 0x2E] ldrh r2, [r0, 0x2E]
asm/list_menu.s
+9 -9
View File
@@ -64,7 +64,7 @@ _081AE4B0:
ldr r1, [sp, 0x4] ldr r1, [sp, 0x4]
bl sub_8098858 bl sub_8098858
_081AE4C0: _081AE4C0:
ldr r0, =gUnknown_03006310 ldr r0, =gMultiuseListMenuTemplate
adds r2, r0, 0 adds r2, r0, 0
ldr r1, [sp] ldr r1, [sp]
ldm r1!, {r3-r5} ldm r1!, {r3-r5}
@@ -87,7 +87,7 @@ _081AE4C0:
.pool .pool
_081AE4F4: _081AE4F4:
ldrb r0, [r5, 0x6] ldrb r0, [r5, 0x6]
bl ListMenuHandleInput bl ListMenuHandleInputGetItemId
str r0, [r5] str r0, [r5]
ldr r1, =gMain ldr r1, =gMain
ldrh r0, [r1, 0x2E] ldrh r0, [r1, 0x2E]
@@ -227,9 +227,9 @@ _081AE5F0:
bx r1 bx r1
thumb_func_end Unused_ListMenuInit2 thumb_func_end Unused_ListMenuInit2
thumb_func_start ListMenuHandleInput thumb_func_start ListMenuHandleInputGetItemId
@ int ListMenuHandleInput(u8 taskId) @ int ListMenuHandleInputGetItemId(u8 taskId)
ListMenuHandleInput: @ 81AE604 ListMenuHandleInputGetItemId: @ 81AE604
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -337,7 +337,7 @@ _081AE6BE:
_081AE6C2: _081AE6C2:
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end ListMenuHandleInput thumb_func_end ListMenuHandleInputGetItemId
thumb_func_start sub_81AE6C8 thumb_func_start sub_81AE6C8
sub_81AE6C8: @ 81AE6C8 sub_81AE6C8: @ 81AE6C8
@@ -557,8 +557,8 @@ _081AE856:
.pool .pool
thumb_func_end sub_81AE838 thumb_func_end sub_81AE838
thumb_func_start get_coro_args_x18_x1A thumb_func_start sub_81AE860
get_coro_args_x18_x1A: @ 81AE860 sub_81AE860: @ 81AE860
push {lr} push {lr}
adds r3, r1, 0 adds r3, r1, 0
lsls r0, 24 lsls r0, 24
@@ -581,7 +581,7 @@ _081AE882:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end get_coro_args_x18_x1A thumb_func_end sub_81AE860
thumb_func_start ListMenuGetYCoordForPrintingArrowCursor thumb_func_start ListMenuGetYCoordForPrintingArrowCursor
@ u8 ListMenuGetYCoordForPrintingArrowCursor(u8 taskId) @ u8 ListMenuGetYCoordForPrintingArrowCursor(u8 taskId)
asm/macros/event.inc
+72 -60
View File
@@ -226,6 +226,18 @@
.2byte \var2 .2byte \var2
.endm .endm
@ Generic compare macro which attempts to deduce argument types based on their values
@ Any values between 0x4000 to 0x4FFF and 0x8000 to 0x8FFF are considered event variable identifiers
.macro compare arg1, arg2
.if ((\arg1 >> 12) == 4 || (\arg1 >> 12) == 8) && ((\arg2 >> 12) == 4 || (\arg2 >> 12) == 8)
compare_var_to_var \arg1, \arg2
.elseif ((\arg1 >> 12) == 4 || (\arg1 >> 12) == 8) && (\arg2 >= 0 && \arg2 <= 0xFFFF)
compare_var_to_value \arg1, \arg2
.else
.error "Invalid arguments for 'compare'"
.endif
.endm
@ Calls the native C function stored at `func`. @ Calls the native C function stored at `func`.
.macro callnative func .macro callnative func
.byte 0x23 .byte 0x23
@@ -518,57 +530,58 @@
.endm .endm
@ Applies the movement data at movements to the specified (index) Object. Also closes any standard message boxes that are still open. @ Applies the movement data at movements to the specified (index) Object. Also closes any standard message boxes that are still open.
.macro applymovement index, movements @ If no map is specified, then the current map is used.
.byte 0x4f .macro applymovement index, movements, map
.2byte \index .ifb \map
.4byte \movements .byte 0x4f
.endm .2byte \index
.4byte \movements
@ Applies the movement data at movements to the specified (index) Object on the specified (map_group, map_num) map. Really only useful if the object has followed from one map to another (e.g. Wally during the catching event). .else
.macro applymovementat variable, movements, map @ Really only useful if the object has followed from one map to another (e.g. Wally during the catching event).
.byte 0x50 .byte 0x50
.2byte \variable .2byte \index
.4byte \movements .4byte \movements
map \map map \map
.endif
.endm .endm
@ Blocks script execution until the movements being applied to the specified (index) Object finish. If the specified Object is 0x0000, then the command will block script execution until all Objects affected by applymovement finish their movements. If the specified Object is not currently being manipulated with applymovement, then this command does nothing. @ Blocks script execution until the movements being applied to the specified (index) Object finish. If the specified Object is 0x0000, then the command will block script execution until all Objects affected by applymovement finish their movements. If the specified Object is not currently being manipulated with applymovement, then this command does nothing.
.macro waitmovement index @ If no map is specified, then the current map is used.
.byte 0x51 .macro waitmovement index, map
.2byte \index .ifb \map
.endm .byte 0x51
.2byte \index
@ Blocks script execution until the movements being applied to the specified (index) Object on the specified (map) map finish. .else
.macro waitmovementat index, map .byte 0x52
.byte 0x52 .2byte \index
.2byte \index map \map
map \map .endif
.endm
@ Attempts to hide the specified (index) Object on the current map, by setting its visibility flag if it has a valid one. If the Object does not have a valid visibility flag, this command does nothing.
.macro removeobject index
.byte 0x53
.2byte \index
.endm .endm
@ Attempts to hide the specified (index) Object on the specified (map_group, map_num) map, by setting its visibility flag if it has a valid one. If the Object does not have a valid visibility flag, this command does nothing. @ Attempts to hide the specified (index) Object on the specified (map_group, map_num) map, by setting its visibility flag if it has a valid one. If the Object does not have a valid visibility flag, this command does nothing.
.macro removeobjectat index, map @ If no map is specified, then the current map is used.
.byte 0x54 .macro removeobject index, map
.2byte \index .ifb \map
map \map .byte 0x53
.endm .2byte \index
.else
@ Unsets the specified (index) Object's visibility flag on the current map if it has a valid one. If the Object does not have a valid visibility flag, this command does nothing. .byte 0x54
.macro addobject index .2byte \index
.byte 0x55 map \map
.2byte \index .endif
.endm .endm
@ Unsets the specified (index) Object's visibility flag on the specified (map_group, map_num) map if it has a valid one. If the Object does not have a valid visibility flag, this command does nothing. @ Unsets the specified (index) Object's visibility flag on the specified (map_group, map_num) map if it has a valid one. If the Object does not have a valid visibility flag, this command does nothing.
.macro addobjectat index, map @ If no map is specified, then the current map is used.
.byte 0x56 .macro addobject index, map
.2byte \index .ifb \map
map \map .byte 0x55
.2byte \index
.else
.byte 0x56
.2byte \index
map \map
.endif
.endm .endm
@ Sets the specified (index) Object's position on the current map. @ Sets the specified (index) Object's position on the current map.
@@ -663,12 +676,12 @@
.byte 0x5d .byte 0x5d
.endm .endm
@ Goes to address after the trainerbattle command (called by the battle functions, see battle_setup.c) @ Goes to address after the trainerbattle command (called by the battle functions, see battle_setup.c)
.macro gotopostbattlescript .macro gotopostbattlescript
.byte 0x5e .byte 0x5e
.endm .endm
@ Goes to address specified in the trainerbattle command (called by the battle functions, see battle_setup.c) @ Goes to address specified in the trainerbattle command (called by the battle functions, see battle_setup.c)
.macro gotobeatenscript .macro gotobeatenscript
.byte 0x5f .byte 0x5f
.endm .endm
@@ -850,11 +863,11 @@
.2byte \species .2byte \species
.endm .endm
.macro setmonmove byte1, byte2, word .macro setmonmove index, slot, move
.byte 0x7b .byte 0x7b
.byte \byte1 .byte \index
.byte \byte2 .byte \slot
.2byte \word .2byte \move
.endm .endm
@ Checks if at least one Pokemon in the player's party knows the specified (index) attack. If so, variable 0x800D (LASTRESULT) is set to the (zero-indexed) slot number of the first Pokemon that knows the move. If not, LASTRESULT is set to 0x0006. Variable 0x8004 is also set to this Pokemon's species. @ Checks if at least one Pokemon in the player's party knows the specified (index) attack. If so, variable 0x800D (LASTRESULT) is set to the (zero-indexed) slot number of the first Pokemon that knows the move. If not, LASTRESULT is set to 0x0006. Variable 0x8004 is also set to this Pokemon's species.
@@ -958,7 +971,7 @@
.endm .endm
@ This allows you to choose a Pokemon to use in a contest. In FireRed, this command sets the byte at 0x03000EA8 to 0x01. @ This allows you to choose a Pokemon to use in a contest. In FireRed, this command sets the byte at 0x03000EA8 to 0x01.
.macro choosecontestpkmn .macro choosecontestmon
.byte 0x8b .byte 0x8b
.endm .endm
@@ -1024,10 +1037,10 @@
.byte \y .byte \y
.endm .endm
@ Gets the price reduction for the index (word) given. In FireRed, this command is a nop. @ Gets the price reduction for the index given. In FireRed, this command is a nop.
.macro getpricereduction word .macro getpricereduction index
.byte 0x96 .byte 0x96
.2byte \word .2byte \index
.endm .endm
@ Fades the screen to and from black and white. Mode 0x00 fades from black, mode 0x01 fades out to black, mode 0x2 fades in from white, and mode 0x3 fades out to white. @ Fades the screen to and from black and white. Mode 0x00 fades from black, mode 0x01 fades out to black, mode 0x2 fades in from white, and mode 0x3 fades out to white.
@@ -1078,9 +1091,9 @@
.endm .endm
@ Sets which healing place the player will return to if all of the Pokemon in their party faint. @ Sets which healing place the player will return to if all of the Pokemon in their party faint.
.macro setrespawn flightspot .macro setrespawn heallocation
.byte 0x9f .byte 0x9f
.2byte \flightspot .2byte \heallocation
.endm .endm
@ Checks the player's gender. If male, then 0x0000 is stored in variable 0x800D (LASTRESULT). If female, then 0x0001 is stored in LASTRESULT. @ Checks the player's gender. If male, then 0x0000 is stored in variable 0x800D (LASTRESULT). If female, then 0x0001 is stored in LASTRESULT.
@@ -1187,7 +1200,7 @@
.endm .endm
@ Sets the door tile at (x, y) to be closed without an animation. @ Sets the door tile at (x, y) to be closed without an animation.
.macro setdoorclosed2 x, y .macro setdoorclosed x, y
.byte 0xb0 .byte 0xb0
.2byte \x .2byte \x
.2byte \y .2byte \y
@@ -1217,9 +1230,9 @@
.2byte \count .2byte \count
.endm .endm
.macro takecoins word .macro takecoins count
.byte 0xb5 .byte 0xb5
.2byte \word .2byte \count
.endm .endm
@ Prepares to start a wild battle against a species at Level level holding item. Running this command will not affect normal wild battles. You start the prepared battle with dowildbattle. @ Prepares to start a wild battle against a species at Level level holding item. Running this command will not affect normal wild battles. You start the prepared battle with dowildbattle.
@@ -1235,10 +1248,9 @@
.byte 0xb7 .byte 0xb7
.endm .endm
.macro setvaddress long, word .macro setvaddress pointer
.byte 0xb8 .byte 0xb8
.4byte \long .4byte \pointer
.2byte \word
.endm .endm
.macro vgoto pointer .macro vgoto pointer
asm/macros/m4a.inc
+13
View File
@@ -0,0 +1,13 @@
.macro song label, music_player, unknown
.4byte \label
.2byte \music_player
.2byte \unknown
.endm
.macro music_player info_struct, track_struct, unknown_1, unknown_2
.4byte \info_struct
.4byte \track_struct
.byte \unknown_1
.space 1
.2byte \unknown_2
.endm
asm/menu_helpers.s
+13 -13
View File
@@ -5,8 +5,8 @@
.text .text
thumb_func_start sub_8121DA0 thumb_func_start ResetVramOamAndBgCntRegs
sub_8121DA0: @ 8121DA0 ResetVramOamAndBgCntRegs: @ 8121DA0
push {r4,lr} push {r4,lr}
sub sp, 0xC sub sp, 0xC
movs r0, 0 movs r0, 0
@@ -50,10 +50,10 @@ sub_8121DA0: @ 8121DA0
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_8121DA0 thumb_func_end ResetVramOamAndBgCntRegs
thumb_func_start sub_8121E10 thumb_func_start ResetAllBgsCoordinates
sub_8121E10: @ 8121E10 ResetAllBgsCoordinates: @ 8121E10
push {lr} push {lr}
movs r0, 0 movs r0, 0
movs r1, 0 movs r1, 0
@@ -89,7 +89,7 @@ sub_8121E10: @ 8121E10
bl ChangeBgY bl ChangeBgY
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_8121E10 thumb_func_end ResetAllBgsCoordinates
thumb_func_start SetVBlankHBlankCallbacksToNull thumb_func_start SetVBlankHBlankCallbacksToNull
@ void SetVBlankHBlankCallbacksToNull() @ void SetVBlankHBlankCallbacksToNull()
@@ -177,8 +177,8 @@ _08121EC0:
.pool .pool
thumb_func_end DisplayMessageAndContinueTask thumb_func_end DisplayMessageAndContinueTask
thumb_func_start sub_8121F20 thumb_func_start RunTextPrintersRetIsActive
sub_8121F20: @ 8121F20 RunTextPrintersRetIsActive: @ 8121F20
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
@@ -191,7 +191,7 @@ sub_8121F20: @ 8121F20
pop {r4} pop {r4}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_8121F20 thumb_func_end RunTextPrintersRetIsActive
thumb_func_start Task_ContinueTaskAfterMessagePrints thumb_func_start Task_ContinueTaskAfterMessagePrints
@ void Task_ContinueTaskAfterMessagePrints(u8 taskId) @ void Task_ContinueTaskAfterMessagePrints(u8 taskId)
@@ -201,7 +201,7 @@ Task_ContinueTaskAfterMessagePrints: @ 8121F3C
lsrs r4, r0, 24 lsrs r4, r0, 24
ldr r0, =gUnknown_0203A140 ldr r0, =gUnknown_0203A140
ldrb r0, [r0] ldrb r0, [r0]
bl sub_8121F20 bl RunTextPrintersRetIsActive
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
bne _08121F5A bne _08121F5A
@@ -752,8 +752,8 @@ _08122322:
bx r0 bx r0
thumb_func_end sub_8122298 thumb_func_end sub_8122298
thumb_func_start sub_8122328 thumb_func_start LoadListMenuArrowsGfx
sub_8122328: @ 8122328 LoadListMenuArrowsGfx: @ 8122328
push {lr} push {lr}
ldr r0, =gUnknown_0859F514 ldr r0, =gUnknown_0859F514
bl LoadCompressedObjectPic bl LoadCompressedObjectPic
@@ -762,7 +762,7 @@ sub_8122328: @ 8122328
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_8122328 thumb_func_end LoadListMenuArrowsGfx
thumb_func_start sub_8122344 thumb_func_start sub_8122344
sub_8122344: @ 8122344 sub_8122344: @ 8122344
asm/overworld.s
+1 -1
View File
@@ -21,7 +21,7 @@ sub_8084620: @ 8084620
lsrs r1, 1 lsrs r1, 1
adds r0, r4, 0 adds r0, r4, 0
bl SetMoney bl SetMoney
bl sp000_heal_pokemon bl HealPlayerParty
bl sub_8084720 bl sub_8084720
bl copy_saved_warp3_bank_and_enter_x_to_warp1 bl copy_saved_warp3_bank_and_enter_x_to_warp1
bl warp_in bl warp_in
asm/party_menu.s
+3 -3
View File
@@ -98,7 +98,7 @@ _081B0234:
.4byte _081B0474 .4byte _081B0474
_081B0290: _081B0290:
bl SetVBlankHBlankCallbacksToNull bl SetVBlankHBlankCallbacksToNull
bl sub_8121DA0 bl ResetVramOamAndBgCntRegs
bl clear_scheduled_bg_copies_to_vram bl clear_scheduled_bg_copies_to_vram
ldr r1, =gMain ldr r1, =gMain
movs r0, 0x87 movs r0, 0x87
@@ -429,7 +429,7 @@ sub_81B0550: @ 81B0550
ldr r1, [r5] ldr r1, [r5]
movs r0, 0x1 movs r0, 0x1
bl SetBgTilemapBuffer bl SetBgTilemapBuffer
bl sub_8121E10 bl ResetAllBgsCoordinates
movs r0, 0x1 movs r0, 0x1
bl schedule_bg_copy_tilemap_to_vram bl schedule_bg_copy_tilemap_to_vram
movs r1, 0x82 movs r1, 0x82
@@ -3161,7 +3161,7 @@ sub_81B1B8C: @ 81B1B8C
lsrs r4, r0, 24 lsrs r4, r0, 24
adds r5, r4, 0 adds r5, r4, 0
movs r0, 0x6 movs r0, 0x6
bl sub_8121F20 bl RunTextPrintersRetIsActive
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
cmp r0, 0x1 cmp r0, 0x1
asm/player_pc.s
+13 -13
View File
@@ -733,7 +733,7 @@ sub_816B430: @ 816B430
bl sub_816B4C0 bl sub_816B4C0
bl sub_816BC14 bl sub_816BC14
bl gpu_pal_allocator_reset__manage_upper_four bl gpu_pal_allocator_reset__manage_upper_four
bl sub_8122328 bl LoadListMenuArrowsGfx
ldr r0, =gUnknown_0203BCC4 ldr r0, =gUnknown_0203BCC4
ldr r0, [r0] ldr r0, [r0]
movs r1, 0xCD movs r1, 0xCD
@@ -1013,7 +1013,7 @@ sub_816B674: @ 816B674
cmp r0, 0 cmp r0, 0
bne _0816B71E bne _0816B71E
ldrb r0, [r4, 0xA] ldrb r0, [r4, 0xA]
bl ListMenuHandleInput bl ListMenuHandleInputGetItemId
adds r6, r0, 0 adds r6, r0, 0
ldrb r0, [r4, 0xA] ldrb r0, [r4, 0xA]
ldr r7, =gUnknown_0203BCBA ldr r7, =gUnknown_0203BCBA
@@ -1021,7 +1021,7 @@ sub_816B674: @ 816B674
mov r8, r1 mov r8, r1
adds r1, r7, 0 adds r1, r7, 0
mov r2, r8 mov r2, r8
bl get_coro_args_x18_x1A bl sub_81AE860
movs r0, 0x2 movs r0, 0x2
negs r0, r0 negs r0, r0
cmp r6, r0 cmp r6, r0
@@ -1820,7 +1820,7 @@ _0816BD58:
movs r1, 0x2 movs r1, 0x2
negs r1, r1 negs r1, r1
str r1, [r0] str r1, [r0]
ldr r4, =gUnknown_03006310 ldr r4, =gMultiuseListMenuTemplate
adds r1, r4, 0 adds r1, r4, 0
ldr r0, =gUnknown_085DFF44 ldr r0, =gUnknown_085DFF44
ldm r0!, {r2,r3,r6} ldm r0!, {r2,r3,r6}
@@ -2327,7 +2327,7 @@ _0816C186:
bl sub_816C110 bl sub_816C110
bl sub_816C140 bl sub_816C140
bl sub_816BD04 bl sub_816BD04
ldr r0, =gUnknown_03006310 ldr r0, =gMultiuseListMenuTemplate
ldr r2, =gUnknown_0203BCB8 ldr r2, =gUnknown_0203BCB8
ldrh r1, [r2, 0x2] ldrh r1, [r2, 0x2]
ldrh r2, [r2] ldrh r2, [r2]
@@ -2476,7 +2476,7 @@ sub_816C30C: @ 816C30C
ldr r1, =gUnknown_0203BCBA ldr r1, =gUnknown_0203BCBA
subs r4, r1, 0x2 subs r4, r1, 0x2
adds r2, r4, 0 adds r2, r4, 0
bl get_coro_args_x18_x1A bl sub_81AE860
ldrh r1, [r4, 0x2] ldrh r1, [r4, 0x2]
ldrh r0, [r4] ldrh r0, [r4]
adds r1, r0 adds r1, r0
@@ -2492,12 +2492,12 @@ sub_816C30C: @ 816C30C
.pool .pool
_0816C35C: _0816C35C:
ldrb r0, [r4, 0xA] ldrb r0, [r4, 0xA]
bl ListMenuHandleInput bl ListMenuHandleInputGetItemId
adds r6, r0, 0 adds r6, r0, 0
ldrb r0, [r4, 0xA] ldrb r0, [r4, 0xA]
ldr r1, =gUnknown_0203BCBA ldr r1, =gUnknown_0203BCBA
subs r2, r1, 0x2 subs r2, r1, 0x2
bl get_coro_args_x18_x1A bl sub_81AE860
movs r0, 0x2 movs r0, 0x2
negs r0, r0 negs r0, r0
cmp r6, r0 cmp r6, r0
@@ -2691,18 +2691,18 @@ sub_816C4FC: @ 816C4FC
ldrb r0, [r4, 0xA] ldrb r0, [r4, 0xA]
ldr r1, =gUnknown_0203BCBA ldr r1, =gUnknown_0203BCBA
subs r2, r1, 0x2 subs r2, r1, 0x2
bl get_coro_args_x18_x1A bl sub_81AE860
b _0816C57E b _0816C57E
.pool .pool
_0816C530: _0816C530:
ldrb r0, [r4, 0xA] ldrb r0, [r4, 0xA]
bl ListMenuHandleInput bl ListMenuHandleInputGetItemId
adds r6, r0, 0 adds r6, r0, 0
ldrb r0, [r4, 0xA] ldrb r0, [r4, 0xA]
ldr r1, =gUnknown_0203BCBA ldr r1, =gUnknown_0203BCBA
subs r4, r1, 0x2 subs r4, r1, 0x2
adds r2, r4, 0 adds r2, r4, 0
bl get_coro_args_x18_x1A bl sub_81AE860
ldr r0, =gUnknown_0203BCC4 ldr r0, =gUnknown_0203BCC4
ldr r0, [r0] ldr r0, [r0]
movs r1, 0xCD movs r1, 0xCD
@@ -2825,7 +2825,7 @@ _0816C622:
adds r0, r2 adds r0, r2
movs r1, 0xFF movs r1, 0xFF
strb r1, [r0] strb r1, [r0]
ldr r0, =gUnknown_03006310 ldr r0, =gMultiuseListMenuTemplate
ldr r2, =gUnknown_0203BCB8 ldr r2, =gUnknown_0203BCB8
ldrh r1, [r2, 0x2] ldrh r1, [r2, 0x2]
ldrh r2, [r2] ldrh r2, [r2]
@@ -3363,7 +3363,7 @@ sub_816CB04: @ 816CB04
bl sub_816C110 bl sub_816C110
bl sub_816C140 bl sub_816C140
bl sub_816BD04 bl sub_816BD04
ldr r0, =gUnknown_03006310 ldr r0, =gMultiuseListMenuTemplate
ldrh r1, [r4, 0x2] ldrh r1, [r4, 0x2]
ldrh r2, [r4] ldrh r2, [r4]
bl ListMenuInit bl ListMenuInit
asm/pokeblock_feed.s
-1873
View File
File diff suppressed because it is too large Load Diff
asm/pokemon_summary_screen.s
+14 -14
View File
@@ -2351,7 +2351,7 @@ _081C51D6:
thumb_func_start sub_81C51DC thumb_func_start sub_81C51DC
sub_81C51DC: @ 81C51DC sub_81C51DC: @ 81C51DC
push {lr} push {lr}
bl sub_8121DA0 bl ResetVramOamAndBgCntRegs
movs r0, 0 movs r0, 0
bl ResetBgsAndClearDma3BusyFlags bl ResetBgsAndClearDma3BusyFlags
ldr r1, =gUnknown_0861F2B4 ldr r1, =gUnknown_0861F2B4
@@ -2363,7 +2363,7 @@ sub_81C51DC: @ 81C51DC
adds r1, 0x4 adds r1, 0x4
movs r0, 0x2 movs r0, 0x2
bl SetBgTilemapBuffer bl SetBgTilemapBuffer
bl sub_8121E10 bl ResetAllBgsCoordinates
movs r0, 0x2 movs r0, 0x2
bl schedule_bg_copy_tilemap_to_vram bl schedule_bg_copy_tilemap_to_vram
movs r1, 0x82 movs r1, 0x82
@@ -2460,7 +2460,7 @@ _081C52DC:
b _081C5308 b _081C5308
.pool .pool
_081C52F0: _081C52F0:
bl sub_8122328 bl LoadListMenuArrowsGfx
ldr r0, [r4] ldr r0, [r4]
ldr r1, =0x00000984 ldr r1, =0x00000984
adds r0, r1 adds r0, r1
@@ -2559,7 +2559,7 @@ _081C5382:
movs r0, 0x2 movs r0, 0x2
negs r0, r0 negs r0, r0
str r0, [r1] str r0, [r1]
ldr r2, =gUnknown_03006310 ldr r2, =gMultiuseListMenuTemplate
adds r1, r2, 0 adds r1, r2, 0
ldr r0, =gUnknown_0861F2C0 ldr r0, =gUnknown_0861F2C0
ldm r0!, {r4,r6,r7} ldm r0!, {r4,r6,r7}
@@ -2918,7 +2918,7 @@ sub_81C56F8: @ 81C56F8
lsls r4, 3 lsls r4, 3
ldr r0, =gTasks + 0x8 ldr r0, =gTasks + 0x8
adds r4, r0 adds r4, r0
ldr r0, =gUnknown_03006310 ldr r0, =gMultiuseListMenuTemplate
ldr r2, =gUnknown_0203CF30 ldr r2, =gUnknown_0203CF30
ldrh r1, [r2, 0x8] ldrh r1, [r2, 0x8]
ldrh r2, [r2, 0x6] ldrh r2, [r2, 0x6]
@@ -3545,7 +3545,7 @@ _081C5C12:
adds r1, r4, 0 adds r1, r4, 0
adds r1, 0x8 adds r1, 0x8
adds r2, r4, 0x6 adds r2, r4, 0x6
bl get_coro_args_x18_x1A bl sub_81AE860
ldrh r1, [r4, 0x8] ldrh r1, [r4, 0x8]
ldrh r0, [r4, 0x6] ldrh r0, [r4, 0x6]
adds r1, r0 adds r1, r0
@@ -3565,14 +3565,14 @@ _081C5C12:
.pool .pool
_081C5C5C: _081C5C5C:
ldrb r0, [r7] ldrb r0, [r7]
bl ListMenuHandleInput bl ListMenuHandleInputGetItemId
adds r6, r0, 0 adds r6, r0, 0
ldrb r0, [r7] ldrb r0, [r7]
ldr r1, =gUnknown_0203CF38 ldr r1, =gUnknown_0203CF38
mov r8, r1 mov r8, r1
mov r2, r8 mov r2, r8
subs r2, 0x2 subs r2, 0x2
bl get_coro_args_x18_x1A bl sub_81AE860
movs r0, 0x2 movs r0, 0x2
negs r0, r0 negs r0, r0
cmp r6, r0 cmp r6, r0
@@ -4646,7 +4646,7 @@ sub_81C65CC: @ 81C65CC
bl sub_81C5924 bl sub_81C5924
bl sub_81C59BC bl sub_81C59BC
bl sub_81C5314 bl sub_81C5314
ldr r0, =gUnknown_03006310 ldr r0, =gMultiuseListMenuTemplate
ldrh r1, [r6] ldrh r1, [r6]
ldrh r2, [r7] ldrh r2, [r7]
bl ListMenuInit bl ListMenuInit
@@ -4953,18 +4953,18 @@ sub_81C68B0: @ 81C68B0
ldrb r0, [r4] ldrb r0, [r4]
ldr r1, =gUnknown_0203CF38 ldr r1, =gUnknown_0203CF38
subs r2, r1, 0x2 subs r2, r1, 0x2
bl get_coro_args_x18_x1A bl sub_81AE860
b _081C6940 b _081C6940
.pool .pool
_081C68F8: _081C68F8:
ldrb r0, [r4] ldrb r0, [r4]
bl ListMenuHandleInput bl ListMenuHandleInputGetItemId
adds r6, r0, 0 adds r6, r0, 0
ldrb r0, [r4] ldrb r0, [r4]
ldr r4, =gUnknown_0203CF38 ldr r4, =gUnknown_0203CF38
subs r2, r4, 0x2 subs r2, r4, 0x2
adds r1, r4, 0 adds r1, r4, 0
bl get_coro_args_x18_x1A bl sub_81AE860
movs r0, 0 movs r0, 0
bl sub_81C7028 bl sub_81C7028
subs r4, 0x8 subs r4, 0x8
@@ -5066,7 +5066,7 @@ _081C69A8:
strh r0, [r1, 0x6] strh r0, [r1, 0x6]
_081C69E0: _081C69E0:
bl sub_81C5314 bl sub_81C5314
ldr r0, =gUnknown_03006310 ldr r0, =gMultiuseListMenuTemplate
ldrh r1, [r7] ldrh r1, [r7]
mov r3, r8 mov r3, r8
ldrh r2, [r3] ldrh r2, [r3]
@@ -5124,7 +5124,7 @@ sub_81C6A14: @ 81C6A14
strh r0, [r1, 0x6] strh r0, [r1, 0x6]
_081C6A5E: _081C6A5E:
bl sub_81C5314 bl sub_81C5314
ldr r0, =gUnknown_03006310 ldr r0, =gMultiuseListMenuTemplate
ldrh r1, [r5] ldrh r1, [r5]
ldrh r2, [r7] ldrh r2, [r7]
bl ListMenuInit bl ListMenuInit
asm/pokenav.s
+2 -2
View File
@@ -21921,7 +21921,7 @@ sub_81D1DC0: @ 81D1DC0
ldr r7, =gUnknown_0203CF4C ldr r7, =gUnknown_0203CF4C
ldr r0, =gText_Cancel2 ldr r0, =gText_Cancel2
mov r12, r0 mov r12, r0
ldr r4, =gUnknown_03006310 ldr r4, =gMultiuseListMenuTemplate
ldr r1, =gUnknown_0203CF48 ldr r1, =gUnknown_0203CF48
mov r8, r1 mov r8, r1
ldr r2, =sub_81D1E7C ldr r2, =sub_81D1E7C
@@ -23376,7 +23376,7 @@ sub_81D28C8: @ 81D28C8
push {r4-r7,lr} push {r4-r7,lr}
lsls r1, 16 lsls r1, 16
lsrs r4, r1, 16 lsrs r4, r1, 16
ldr r3, =gUnknown_03006310 ldr r3, =gMultiuseListMenuTemplate
adds r2, r3, 0 adds r2, r3, 0
ldr r1, =gUnknown_08625548 ldr r1, =gUnknown_08625548
ldm r1!, {r5-r7} ldm r1!, {r5-r7}
asm/rayquaza_scene.s
+10 -10
View File
@@ -1066,7 +1066,7 @@ sub_81D6FD0: @ 81D6FD0
thumb_func_start sub_81D6FE0 thumb_func_start sub_81D6FE0
sub_81D6FE0: @ 81D6FE0 sub_81D6FE0: @ 81D6FE0
push {r4,lr} push {r4,lr}
bl sub_8121DA0 bl ResetVramOamAndBgCntRegs
movs r0, 0 movs r0, 0
bl ResetBgsAndClearDma3BusyFlags bl ResetBgsAndClearDma3BusyFlags
ldr r1, =gUnknown_0862A888 ldr r1, =gUnknown_0862A888
@@ -1088,7 +1088,7 @@ sub_81D6FE0: @ 81D6FE0
adds r1, r0 adds r1, r0
movs r0, 0x2 movs r0, 0x2
bl SetBgTilemapBuffer bl SetBgTilemapBuffer
bl sub_8121E10 bl ResetAllBgsCoordinates
movs r0, 0 movs r0, 0
bl schedule_bg_copy_tilemap_to_vram bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x1 movs r0, 0x1
@@ -2758,7 +2758,7 @@ _081D7E08:
thumb_func_start sub_81D7E10 thumb_func_start sub_81D7E10
sub_81D7E10: @ 81D7E10 sub_81D7E10: @ 81D7E10
push {r4,lr} push {r4,lr}
bl sub_8121DA0 bl ResetVramOamAndBgCntRegs
movs r0, 0 movs r0, 0
bl ResetBgsAndClearDma3BusyFlags bl ResetBgsAndClearDma3BusyFlags
ldr r1, =gUnknown_0862AA54 ldr r1, =gUnknown_0862AA54
@@ -2780,7 +2780,7 @@ sub_81D7E10: @ 81D7E10
adds r1, r0 adds r1, r0
movs r0, 0x2 movs r0, 0x2
bl SetBgTilemapBuffer bl SetBgTilemapBuffer
bl sub_8121E10 bl ResetAllBgsCoordinates
movs r0, 0 movs r0, 0
bl schedule_bg_copy_tilemap_to_vram bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x1 movs r0, 0x1
@@ -3292,7 +3292,7 @@ _081D829A:
thumb_func_start sub_81D82B0 thumb_func_start sub_81D82B0
sub_81D82B0: @ 81D82B0 sub_81D82B0: @ 81D82B0
push {r4,lr} push {r4,lr}
bl sub_8121DA0 bl ResetVramOamAndBgCntRegs
movs r0, 0 movs r0, 0
bl ResetBgsAndClearDma3BusyFlags bl ResetBgsAndClearDma3BusyFlags
ldr r1, =gUnknown_0862AACC ldr r1, =gUnknown_0862AACC
@@ -3319,7 +3319,7 @@ sub_81D82B0: @ 81D82B0
adds r1, r0 adds r1, r0
movs r0, 0x3 movs r0, 0x3
bl SetBgTilemapBuffer bl SetBgTilemapBuffer
bl sub_8121E10 bl ResetAllBgsCoordinates
movs r0, 0 movs r0, 0
bl schedule_bg_copy_tilemap_to_vram bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x1 movs r0, 0x1
@@ -3899,7 +3899,7 @@ _081D8818:
thumb_func_start sub_81D8828 thumb_func_start sub_81D8828
sub_81D8828: @ 81D8828 sub_81D8828: @ 81D8828
push {r4,lr} push {r4,lr}
bl sub_8121DA0 bl ResetVramOamAndBgCntRegs
movs r0, 0 movs r0, 0
bl ResetBgsAndClearDma3BusyFlags bl ResetBgsAndClearDma3BusyFlags
ldr r1, =gUnknown_0862AB44 ldr r1, =gUnknown_0862AB44
@@ -3926,7 +3926,7 @@ sub_81D8828: @ 81D8828
adds r1, r0 adds r1, r0
movs r0, 0x3 movs r0, 0x3
bl SetBgTilemapBuffer bl SetBgTilemapBuffer
bl sub_8121E10 bl ResetAllBgsCoordinates
movs r0, 0 movs r0, 0
bl schedule_bg_copy_tilemap_to_vram bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x1 movs r0, 0x1
@@ -4354,7 +4354,7 @@ _081D8C26:
thumb_func_start sub_81D8C38 thumb_func_start sub_81D8C38
sub_81D8C38: @ 81D8C38 sub_81D8C38: @ 81D8C38
push {r4,lr} push {r4,lr}
bl sub_8121DA0 bl ResetVramOamAndBgCntRegs
movs r0, 0 movs r0, 0
bl ResetBgsAndClearDma3BusyFlags bl ResetBgsAndClearDma3BusyFlags
ldr r1, =gUnknown_0862AD08 ldr r1, =gUnknown_0862AD08
@@ -4376,7 +4376,7 @@ sub_81D8C38: @ 81D8C38
adds r1, r0 adds r1, r0
movs r0, 0x2 movs r0, 0x2
bl SetBgTilemapBuffer bl SetBgTilemapBuffer
bl sub_8121E10 bl ResetAllBgsCoordinates
movs r0, 0 movs r0, 0
bl schedule_bg_copy_tilemap_to_vram bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x1 movs r0, 0x1
asm/rom6.s
+1 -12326
View File
File diff suppressed because it is too large Load Diff
asm/rom_81370FC.s
+9455
View File
File diff suppressed because it is too large Load Diff
asm/roulette.s
+4 -4
View File
@@ -425,8 +425,8 @@ _08140618:
bl SetVBlankCallback bl SetVBlankCallback
bl remove_some_task bl remove_some_task
bl SetVBlankHBlankCallbacksToNull bl SetVBlankHBlankCallbacksToNull
bl sub_8121DA0 bl ResetVramOamAndBgCntRegs
bl sub_8121E10 bl ResetAllBgsCoordinates
b _081407F8 b _081407F8
_08140630: _08140630:
bl sub_8140388 bl sub_8140388
@@ -3258,8 +3258,8 @@ sub_8141E7C: @ 8141E7C
ldr r0, =gSpriteCoordOffsetY ldr r0, =gSpriteCoordOffsetY
strh r4, [r0] strh r4, [r0]
strh r4, [r1] strh r4, [r1]
bl sub_8121DA0 bl ResetVramOamAndBgCntRegs
bl sub_8121E10 bl ResetAllBgsCoordinates
movs r0, 0x50 movs r0, 0x50
movs r1, 0 movs r1, 0
bl SetGpuReg bl SetGpuReg
asm/script_pokemon_util_80F87D8.s
+3 -3
View File
@@ -1174,8 +1174,8 @@ _080F917A:
bx r1 bx r1
thumb_func_end sub_80F9160 thumb_func_end sub_80F9160
thumb_func_start sp000_heal_pokemon thumb_func_start HealPlayerParty
sp000_heal_pokemon: @ 80F9180 HealPlayerParty: @ 80F9180
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -1267,7 +1267,7 @@ _080F922C:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sp000_heal_pokemon thumb_func_end HealPlayerParty
thumb_func_start ScriptGiveMon thumb_func_start ScriptGiveMon
@ void ScriptGiveMon(s16 species_num, u8 level, int held_item) @ void ScriptGiveMon(s16 species_num, u8 level, int held_item)
asm/shop.s
+5 -5
View File
@@ -409,7 +409,7 @@ _080DFDAC:
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
ldr r0, =gUnknown_03006310 ldr r0, =gMultiuseListMenuTemplate
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
bl ListMenuInit bl ListMenuInit
@@ -601,7 +601,7 @@ _080DFF78:
movs r0, 0x2 movs r0, 0x2
negs r0, r0 negs r0, r0
str r0, [r1, 0x4] str r0, [r1, 0x4]
ldr r3, =gUnknown_03006310 ldr r3, =gMultiuseListMenuTemplate
adds r1, r3, 0 adds r1, r3, 0
ldr r0, =gUnknown_08589A48 ldr r0, =gUnknown_08589A48
ldm r0!, {r4-r6} ldm r0!, {r4-r6}
@@ -627,7 +627,7 @@ _080DFFDC:
_080DFFDE: _080DFFDE:
ldr r0, =gUnknown_02039F70 ldr r0, =gUnknown_02039F70
ldr r0, [r0] ldr r0, [r0]
ldr r1, =gUnknown_03006310 ldr r1, =gMultiuseListMenuTemplate
ldrh r1, [r1, 0xE] ldrh r1, [r1, 0xE]
ldr r2, =0x00002004 ldr r2, =0x00002004
adds r0, r2 adds r0, r2
@@ -1976,7 +1976,7 @@ Task_BuyMenu: @ 80E0AC8
b _080E0C8E b _080E0C8E
_080E0AEA: _080E0AEA:
ldrb r0, [r4, 0xE] ldrb r0, [r4, 0xE]
bl ListMenuHandleInput bl ListMenuHandleInputGetItemId
adds r5, r0, 0 adds r5, r0, 0
ldrb r0, [r4, 0xE] ldrb r0, [r4, 0xE]
ldr r7, =gUnknown_02039F70 ldr r7, =gUnknown_02039F70
@@ -1985,7 +1985,7 @@ _080E0AEA:
adds r1, r2, r3 adds r1, r2, r3
subs r3, 0x2 subs r3, 0x2
adds r2, r3 adds r2, r3
bl get_coro_args_x18_x1A bl sub_81AE860
movs r0, 0x2 movs r0, 0x2
negs r0, r0 negs r0, r0
cmp r5, r0 cmp r5, r0
asm/use_pokeblock.s
+16 -356
View File
@@ -5,350 +5,10 @@
.text .text
thumb_func_start sub_8166204
sub_8166204: @ 8166204
push {r4-r6,lr}
adds r5, r0, 0
adds r6, r1, 0
ldr r4, =gUnknown_0203BCAC
ldr r0, =0x0000806c
bl AllocZeroed
str r0, [r4]
ldr r1, =gUnknown_0203BC90
ldr r2, =0x00007fd0
adds r0, r2
str r0, [r1]
str r5, [r0, 0x8]
str r6, [r0, 0x4]
ldr r0, =sub_8166380
bl launch_c3_walk_stairs_and_run_once
ldr r0, =sub_816631C
bl SetMainCallback2
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_8166204
thumb_func_start sub_816624C
sub_816624C: @ 816624C
push {r4,r5,lr}
ldr r4, =gUnknown_0203BCAC
ldr r0, =0x0000806c
bl AllocZeroed
str r0, [r4]
ldr r5, =gUnknown_0203BC90
ldr r1, =0x00007fd0
adds r0, r1
str r0, [r5]
ldr r1, =gUnknown_0203BC98
ldr r1, [r1]
str r1, [r0, 0x8]
ldr r1, =gUnknown_0203BC94
ldr r1, [r1]
str r1, [r0, 0x4]
ldr r4, =gUnknown_0203BC9C
ldrb r0, [r4]
bl sub_81672E4
strb r0, [r4]
ldr r5, [r5]
movs r1, 0
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
bls _08166284
movs r1, 0x1
_08166284:
adds r0, r5, 0
adds r0, 0x56
strb r1, [r0]
ldr r0, =sub_8166380
bl launch_c3_walk_stairs_and_run_once
ldr r0, =sub_81662C0
bl SetMainCallback2
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_816624C
thumb_func_start sub_81662C0 thumb_func_start sub_8166564
sub_81662C0: @ 81662C0 sub_8166564: @ 8166564
push {r4,lr}
ldr r4, =gUnknown_0203BC90
ldr r0, [r4]
ldr r0, [r0]
bl _call_via_r0
bl AnimateSprites
bl BuildOamBuffer
bl UpdatePaletteFade
ldr r4, [r4]
ldr r1, [r4]
ldr r0, =map_warp_consider_1_to_outside_or_stair_or_dive
cmp r1, r0
bne _081662F0
adds r0, r4, 0
adds r0, 0x50
movs r1, 0
strb r1, [r0]
ldr r0, =sub_8166304
bl SetMainCallback2
_081662F0:
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_81662C0
thumb_func_start sub_8166304
sub_8166304: @ 8166304
push {lr}
bl sub_81668F8
bl AnimateSprites
bl BuildOamBuffer
bl UpdatePaletteFade
pop {r0}
bx r0
thumb_func_end sub_8166304
thumb_func_start sub_816631C
sub_816631C: @ 816631C
push {lr}
ldr r0, =gUnknown_0203BC90
ldr r0, [r0]
ldr r0, [r0]
bl _call_via_r0
bl AnimateSprites
bl BuildOamBuffer
bl RunTextPrinters
bl UpdatePaletteFade
pop {r0}
bx r0
.pool
thumb_func_end sub_816631C
thumb_func_start sub_8166340
sub_8166340: @ 8166340
push {lr}
bl LoadOam
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
ldr r0, =gUnknown_0203BCAC
ldr r0, [r0]
ldr r1, =0x00007c58
adds r0, r1
bl sub_81D2108
bl sub_80BA0A8
pop {r0}
bx r0
.pool
thumb_func_end sub_8166340
thumb_func_start launch_c3_walk_stairs_and_run_once
launch_c3_walk_stairs_and_run_once: @ 816636C
ldr r1, =gUnknown_0203BC90
ldr r1, [r1]
str r0, [r1]
adds r1, 0x50
movs r0, 0
strb r0, [r1]
bx lr
.pool
thumb_func_end launch_c3_walk_stairs_and_run_once
thumb_func_start sub_8166380
sub_8166380: @ 8166380
push {r4,r5,lr}
sub sp, 0x4
ldr r1, =gUnknown_0203BC90
ldr r0, [r1]
adds r0, 0x50
ldrb r0, [r0]
adds r2, r1, 0
cmp r0, 0xF
bls _08166394
b _08166556
_08166394:
lsls r0, 2
ldr r1, =_081663A8
adds r0, r1
ldr r0, [r0]
mov pc, r0
.pool
.align 2, 0
_081663A8:
.4byte _081663E8
.4byte _0816640C
.4byte _08166416
.4byte _08166434
.4byte _08166464
.4byte _08166468
.4byte _08166474
.4byte _08166484
.4byte _08166490
.4byte _0816649C
.4byte _081664B8
.4byte _081664BC
.4byte _081664E4
.4byte _08166510
.4byte _08166528
.4byte _08166550
_081663E8:
ldr r2, =gUnknown_0203BCAC
ldr r0, [r2]
ldr r1, =0x00007b10
adds r0, r1
movs r1, 0xFF
strb r1, [r0]
ldr r0, [r2]
ldr r2, =0x00007c58
adds r0, r2
bl sub_81D1ED4
b _0816653C
.pool
_0816640C:
bl ResetSpriteData
bl FreeAllSpritePalettes
b _0816653C
_08166416:
movs r0, 0
bl SetVBlankCallback
movs r0, 0
str r0, [sp]
movs r1, 0xC0
lsls r1, 19
ldr r2, =0x05006000
mov r0, sp
bl CpuSet
b _0816653C
.pool
_08166434:
movs r0, 0
bl ResetBgsAndClearDma3BusyFlags
ldr r1, =gUnknown_085DFCCC
movs r0, 0
movs r2, 0x4
bl InitBgsFromTemplates
ldr r0, =gUnknown_085DFCDC
bl InitWindows
bl DeactivateAllTextPrinters
movs r0, 0
movs r1, 0x97
movs r2, 0xE0
bl sub_809882C
b _0816653C
.pool
_08166464:
ldr r1, [r2]
b _08166540
_08166468:
bl sub_8168328
lsls r0, 24
cmp r0, 0
bne _08166556
b _0816653C
_08166474:
ldr r1, =gKeyRepeatStartDelay
movs r0, 0x14
strh r0, [r1]
bl sub_8167420
b _0816653C
.pool
_08166484:
bl sub_8167930
lsls r0, 24
cmp r0, 0
bne _08166556
b _0816653C
_08166490:
movs r0, 0
bl sub_8167608
bl sub_8167760
b _0816653C
_0816649C:
ldr r0, =gUnknown_0203BCAC
ldr r0, [r0]
ldr r1, =0x00007b0e
adds r0, r1
bl sub_81D312C
lsls r0, 24
cmp r0, 0
bne _08166556
b _0816653C
.pool
_081664B8:
ldr r1, [r2]
b _08166540
_081664BC:
ldr r5, =gUnknown_0203BCAC
ldr r1, [r5]
ldr r4, =0x00007c58
adds r0, r1, r4
ldr r2, =0x00007c6c
adds r1, r2
bl sub_81D2754
ldr r0, [r5]
adds r0, r4
bl sub_81D20AC
b _0816653C
.pool
_081664E4:
ldr r4, =gUnknown_0203BCAC
ldr r0, [r4]
ldr r1, =0x00007c58
adds r0, r1
bl sub_81D20BC
lsls r0, 24
cmp r0, 0
bne _08166556
ldr r2, [r4]
ldr r1, =0x00007c58
adds r0, r2, r1
adds r1, 0x14
adds r2, r1
adds r1, r2, 0
bl sub_81D1F84
b _0816653C
.pool
_08166510:
ldr r0, =gUnknown_0203BCAC
ldr r0, [r0]
ldr r2, =0x00007c58
adds r0, r2
bl sub_81D2230
b _0816653C
.pool
_08166528:
movs r0, 0
bl PutWindowTilemap
movs r0, 0x1
bl PutWindowTilemap
movs r0, 0
movs r1, 0x1
bl sub_8167BA0
_0816653C:
ldr r0, =gUnknown_0203BC90
ldr r1, [r0]
_08166540:
adds r1, 0x50
ldrb r0, [r1]
adds r0, 0x1
strb r0, [r1]
b _08166556
.pool
_08166550:
ldr r0, =map_warp_consider_1_to_outside_or_stair_or_dive
bl launch_c3_walk_stairs_and_run_once
_08166556:
add sp, 0x4
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_8166380
thumb_func_start map_warp_consider_1_to_outside_or_stair_or_dive
map_warp_consider_1_to_outside_or_stair_or_dive: @ 8166564
push {r4,lr} push {r4,lr}
sub sp, 0x4 sub sp, 0x4
ldr r4, =gUnknown_0203BC90 ldr r4, =gUnknown_0203BC90
@@ -424,14 +84,14 @@ _081665C0:
bl sub_81D3480 bl sub_81D3480
_0816660A: _0816660A:
ldr r0, =sub_8166634 ldr r0, =sub_8166634
bl launch_c3_walk_stairs_and_run_once bl sub_816636C
_08166610: _08166610:
add sp, 0x4 add sp, 0x4
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end map_warp_consider_1_to_outside_or_stair_or_dive thumb_func_end sub_8166564
thumb_func_start sub_8166634 thumb_func_start sub_8166634
sub_8166634: @ 8166634 sub_8166634: @ 8166634
@@ -567,7 +227,7 @@ _0816675C:
.pool .pool
_08166788: _08166788:
ldr r0, =sub_8166BEC ldr r0, =sub_8166BEC
bl launch_c3_walk_stairs_and_run_once bl sub_816636C
b _0816680E b _0816680E
.pool .pool
_08166794: _08166794:
@@ -611,7 +271,7 @@ _081667CC:
.pool .pool
_081667E8: _081667E8:
ldr r0, =sub_816681C ldr r0, =sub_816681C
bl launch_c3_walk_stairs_and_run_once bl sub_816636C
b _0816680E b _0816680E
.pool .pool
_081667F4: _081667F4:
@@ -656,7 +316,7 @@ _08166838:
adds r0, r1 adds r0, r1
ldrb r0, [r0] ldrb r0, [r0]
bl sub_81672A4 bl sub_81672A4
ldr r1, =gUnknown_0203BC9C ldr r1, =gPokeblockMonId
strb r0, [r1] strb r0, [r1]
ldr r1, =gUnknown_0203BC94 ldr r1, =gUnknown_0203BC94
ldr r2, [r5] ldr r2, [r5]
@@ -708,9 +368,9 @@ _08166888:
str r5, [r4] str r5, [r4]
bl FreeAllWindowBuffers bl FreeAllWindowBuffers
ldr r1, =gMain ldr r1, =gMain
ldr r0, =sub_816624C ldr r0, =CB2_ReturnAndChooseMonToGivePokeblock
str r0, [r1, 0x8] str r0, [r1, 0x8]
bl sub_8179D70 bl CB2_PreparePokeblockFeedScene
_081668D4: _081668D4:
add sp, 0x4 add sp, 0x4
pop {r4,r5} pop {r4,r5}
@@ -752,7 +412,7 @@ _0816693C:
ldr r0, [r0] ldr r0, [r0]
ldr r1, =0x00008041 ldr r1, =0x00008041
adds r0, r1 adds r0, r1
ldr r1, =gUnknown_0203BC9C ldr r1, =gPokeblockMonId
ldrb r0, [r0] ldrb r0, [r0]
ldrb r1, [r1] ldrb r1, [r1]
cmp r0, r1 cmp r0, r1
@@ -837,7 +497,7 @@ _081669F4:
adds r0, r1 adds r0, r1
bl sub_81D3464 bl sub_81D3464
ldr r0, =sub_8166A34 ldr r0, =sub_8166A34
bl launch_c3_walk_stairs_and_run_once bl sub_816636C
ldr r0, =sub_816631C ldr r0, =sub_816631C
bl SetMainCallback2 bl SetMainCallback2
_08166A18: _08166A18:
@@ -1018,9 +678,9 @@ _08166BB6:
bne _08166BDA bne _08166BDA
ldr r0, =gSpecialVar_ItemId ldr r0, =gSpecialVar_ItemId
ldrb r0, [r0] ldrb r0, [r0]
bl sub_8136F68 bl TryClearPokeblock
ldr r0, =sub_8166BEC ldr r0, =sub_8166BEC
bl launch_c3_walk_stairs_and_run_once bl sub_816636C
_08166BDA: _08166BDA:
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
@@ -1225,7 +885,7 @@ sub_8166D44: @ 8166D44
movs r0, 0x2 movs r0, 0x2
movs r1, 0x3 movs r1, 0x3
bl CopyWindowToVram bl CopyWindowToVram
ldr r0, =gUnknown_085DFCFC ldr r0, =sUsePokeblockYesNoWinTemplate
movs r1, 0x97 movs r1, 0x97
movs r2, 0xE movs r2, 0xE
movs r3, 0 movs r3, 0
@@ -1497,7 +1157,7 @@ sub_8166FD4: @ 8166FD4
movs r0, 0 movs r0, 0
_08166FEC: _08166FEC:
lsls r0, 16 lsls r0, 16
ldr r1, =gUnknown_085DFD04 ldr r1, =sContestStatNames
lsls r0, r3, 2 lsls r0, r3, 2
adds r0, r1 adds r0, r1
ldr r1, [r0] ldr r1, [r0]
@@ -1719,7 +1379,7 @@ sub_8167184: @ 8167184
adds r0, r3, 0 adds r0, r3, 0
adds r0, 0x6E adds r0, 0x6E
strh r1, [r0] strh r1, [r0]
ldr r0, =gUnknown_0203BC9E ldr r0, =gPokeblockGain
movs r1, 0 movs r1, 0
ldrsh r0, [r0, r1] ldrsh r0, [r0, r1]
cmp r0, 0 cmp r0, 0
charmap.txt
+530 -236
View File
@@ -451,242 +451,536 @@ DYNAMIC_COLOR6 = 0F @ cerulean
@ sound and music @ sound and music
SE_STOP = 00 00 MUS_DUMMY = 00 00
SE_KAIFUKU = 01 00 SE_KAIFUKU = 01 00
SE_PC_LOGON = 02 00 SE_PC_LOGIN = 02 00
SE_PC_OFF = 03 00 SE_PC_OFF = 03 00
SE_PC_ON = 04 00 SE_PC_ON = 04 00
SE_SELECT = 05 00 SE_SELECT = 05 00
SE_WIN_OPEN = 06 00 SE_WIN_OPEN = 06 00
SE_WALL_HIT = 07 00 SE_WALL_HIT = 07 00
SE_DOOR = 08 00 SE_DOOR = 08 00
SE_KAIDAN = 09 00 SE_KAIDAN = 09 00
SE_DANSA = 0A 00 SE_DANSA = 0A 00
SE_JITENSYA = 0B 00 SE_JITENSYA = 0B 00
SE_KOUKA_L = 0C 00 SE_KOUKA_L = 0C 00
SE_KOUKA_M = 0D 00 SE_KOUKA_M = 0D 00
SE_KOUKA_H = 0E 00 SE_KOUKA_H = 0E 00
SE_BOWA2 = 0F 00 SE_BOWA2 = 0F 00
SE_POKE_DEAD = 10 00 SE_POKE_DEAD = 10 00
SE_NIGERU = 11 00 SE_NIGERU = 11 00
SE_JIDO_DOA = 12 00 SE_JIDO_DOA = 12 00
SE_NAMINORI = 13 00 SE_NAMINORI = 13 00
SE_BAN = 14 00 SE_BAN = 14 00
SE_PIN = 15 00 SE_PIN = 15 00
SE_BOO = 16 00 SE_BOO = 16 00
SE_BOWA = 17 00 SE_BOWA = 17 00
SE_JYUNI = 18 00 SE_JYUNI = 18 00
SE_A = 19 00 SE_A = 19 00
SE_I = 1A 00 SE_I = 1A 00
SE_U = 1B 00 SE_U = 1B 00
SE_E = 1C 00 SE_E = 1C 00
SE_O = 1D 00 SE_O = 1D 00
SE_N = 1E 00 SE_N = 1E 00
SE_SEIKAI = 1F 00 SE_SEIKAI = 1F 00
SE_HAZURE = 20 00 SE_HAZURE = 20 00
SE_EXP = 21 00 SE_EXP = 21 00
SE_JITE_PYOKO = 22 00 SE_JITE_PYOKO = 22 00
SE_MU_PACHI = 23 00 SE_MU_PACHI = 23 00
SE_TK_KASYA = 24 00 SE_TK_KASYA = 24 00
SE_FU_ZAKU = 25 00 SE_FU_ZAKU = 25 00
SE_FU_ZAKU2 = 26 00 SE_FU_ZAKU2 = 26 00
SE_FU_ZUZUZU = 27 00 SE_FU_ZUZUZU = 27 00
SE_RU_GASHIN = 28 00 SE_RU_GASHIN = 28 00
SE_RU_GASYAN = 29 00 SE_RU_GASYAN = 29 00
SE_RU_BARI = 2A 00 SE_RU_BARI = 2A 00
SE_RU_HYUU = 2B 00 SE_RU_HYUU = 2B 00
SE_KI_GASYAN = 2C 00 SE_KI_GASYAN = 2C 00
SE_TK_WARPIN = 2D 00 SE_TK_WARPIN = 2D 00
SE_TK_WARPOUT = 2E 00 SE_TK_WARPOUT = 2E 00
SE_TU_SAA = 2F 00 SE_TU_SAA = 2F 00
SE_HI_TURUN = 30 00 SE_HI_TURUN = 30 00
SE_TRACK_MOVE = 31 00 SE_TRACK_MOVE = 31 00
SE_TRACK_STOP = 32 00 SE_TRACK_STOP = 32 00
SE_TRACK_HAIK = 33 00 SE_TRACK_HAIKI = 33 00
SE_TRACK_DOOR = 34 00 SE_TRACK_DOOR = 34 00
SE_MOTER = 35 00 SE_MOTER = 35 00
SE_CARD = 36 00 SE_CARD = 36 00
SE_SAVE = 37 00 SE_SAVE = 37 00
SE_KON = 38 00 SE_KON = 38 00
SE_KON2 = 39 00 SE_KON2 = 39 00
SE_KON3 = 3A 00 SE_KON3 = 3A 00
SE_KON4 = 3B 00 SE_KON4 = 3B 00
SE_SUIKOMU = 3C 00 SE_SUIKOMU = 3C 00
SE_NAGERU = 3D 00 SE_NAGERU = 3D 00
SE_TOY_C = 3E 00 SE_TOY_C = 3E 00
SE_TOY_D = 3F 00 SE_TOY_D = 3F 00
SE_TOY_E = 40 00 SE_TOY_E = 40 00
SE_TOY_F = 41 00 SE_TOY_F = 41 00
SE_TOY_G = 42 00 SE_TOY_G = 42 00
SE_TOY_A = 43 00 SE_TOY_A = 43 00
SE_TOY_B = 44 00 SE_TOY_B = 44 00
SE_TOY_C1 = 45 00 SE_TOY_C1 = 45 00
SE_MIZU = 46 00 SE_MIZU = 46 00
SE_HASHI = 47 00 SE_HASHI = 47 00
SE_DAUGI = 48 00 SE_DAUGI = 48 00
SE_PINPON = 49 00 SE_PINPON = 49 00
SE_FUUSEN1 = 4A 00 SE_FUUSEN1 = 4A 00
SE_FUUSEN2 = 4B 00 SE_FUUSEN2 = 4B 00
SE_FUUSEN3 = 4C 00 SE_FUUSEN3 = 4C 00
SE_TOY_KABE = 4D 00 SE_TOY_KABE = 4D 00
SE_TOY_DANGO = 4E 00 SE_TOY_DANGO = 4E 00
SE_DOKU = 4F 00 SE_DOKU = 4F 00
SE_ESUKA = 50 00 SE_ESUKA = 50 00
SE_T_AME = 51 00 SE_T_AME = 51 00
SE_T_AME_E = 52 00 SE_T_AME_E = 52 00
SE_T_OOAME = 53 00 SE_T_OOAME = 53 00
SE_T_OOAME_E = 54 00 SE_T_OOAME_E = 54 00
SE_T_KOAME = 55 00 SE_T_KOAME = 55 00
SE_T_KOAME_E = 56 00 SE_T_KOAME_E = 56 00
SE_T_KAMI = 57 00 SE_T_KAMI = 57 00
SE_T_KAMI2 = 58 00 SE_T_KAMI2 = 58 00
SE_ELEBETA = 59 00 SE_ELEBETA = 59 00
SE_HINSI = 5A 00 SE_HINSI = 5A 00
SE_EXPMAX = 5B 00 SE_EXPMAX = 5B 00
SE_TAMAKORO = 5C 00 SE_TAMAKORO = 5C 00
SE_TAMAKORO_E = 5D 00 SE_TAMAKORO_E = 5D 00
SE_BASABASA = 5E 00 SE_BASABASA = 5E 00
SE_REGI = 5F 00 SE_REGI = 5F 00
SE_C_GAJI = 60 00 SE_C_GAJI = 60 00
SE_C_MAKU_U = 61 00 SE_C_MAKU_U = 61 00
SE_C_MAKU_D = 62 00 SE_C_MAKU_D = 62 00
SE_C_PASI = 63 00 SE_C_PASI = 63 00
SE_C_SYU = 64 00 SE_C_SYU = 64 00
SE_C_PIKON = 65 00 SE_C_PIKON = 65 00
SE_REAPOKE = 66 00 SE_REAPOKE = 66 00
SE_OP_BASYU = 67 00 SE_OP_BASYU = 67 00
SE_BT_START = 68 00 SE_BT_START = 68 00
SE_DENDOU = 69 00 SE_DENDOU = 69 00
SE_JIHANKI = 6A 00 SE_JIHANKI = 6A 00
SE_TAMA = 6B 00 SE_TAMA = 6B 00
SE_Z_SCROLL = 6C 00 SE_Z_SCROLL = 6C 00
SE_Z_PAGE = 6D 00 SE_Z_PAGE = 6D 00
SE_PN_ON = 6E 00 SE_PN_ON = 6E 00
SE_PN_OFF = 6F 00 SE_PN_OFF = 6F 00
SE_Z_SEARCH = 70 00 SE_Z_SEARCH = 70 00
SE_TAMAGO = 71 00 SE_TAMAGO = 71 00
SE_TB_START = 72 00 SE_TB_START = 72 00
SE_TB_KON = 73 00 SE_TB_KON = 73 00
SE_TB_KARA = 74 00 SE_TB_KARA = 74 00
SE_BIDORO = 75 00 SE_BIDORO = 75 00
BGM_STOP = 5D 01 SE_W085 = 76 00
BGM_TETSUJI = 5E 01 SE_W085B = 77 00
BGM_FIELD13 = 5F 01 SE_W231 = 78 00
BGM_KACHI22 = 60 01 SE_W171 = 79 00
BGM_KACHI2 = 61 01 SE_W233 = 7A 00
BGM_KACHI3 = 62 01 SE_W233B = 7B 00
BGM_KACHI5 = 63 01 SE_W145 = 7C 00
BGM_PCC = 64 01 SE_W145B = 7D 00
BGM_NIBI = 65 01 SE_W145C = 7E 00
BGM_SUIKUN = 66 01 SE_W240 = 7F 00
BGM_DOORO1 = 67 01 SE_W015 = 80 00
BGM_DOORO_X1 = 68 01 SE_W081 = 81 00
BGM_DOORO_X3 = 69 01 SE_W081B = 82 00
BGM_MACHI_S2 = 6A 01 SE_W088 = 83 00
BGM_MACHI_S4 = 6B 01 SE_W016 = 84 00
BGM_GIM = 6C 01 SE_W016B = 85 00
BGM_NAMINORI = 6D 01 SE_W003 = 86 00
BGM_DAN01 = 6E 01 SE_W104 = 87 00
BGM_FANFA1 = 6F 01 SE_W013 = 88 00
BGM_ME_ASA = 70 01 SE_W196 = 89 00
BGM_ME_BACHI = 71 01 SE_W086 = 8A 00
BGM_FANFA4 = 72 01 SE_W004 = 8B 00
BGM_FANFA5 = 73 01 SE_W025 = 8C 00
BGM_ME_WAZA = 74 01 SE_W025B = 8D 00
BGM_BIJYUTU = 75 01 SE_W152 = 8E 00
BGM_DOORO_X4 = 76 01 SE_W026 = 8F 00
BGM_FUNE_KAN = 77 01 SE_W172 = 90 00
BGM_ME_SHINKA = 78 01 SE_W172B = 91 00
BGM_SHINKA = 79 01 SE_W053 = 92 00
BGM_ME_WASURE = 7A 01 SE_W007 = 93 00
BGM_SYOUJOEYE = 7B 01 SE_W092 = 94 00
BGM_BOYEYE = 7C 01 SE_W221 = 95 00
BGM_DAN02 = 7D 01 SE_W221B = 96 00
BGM_MACHI_S3 = 7E 01 SE_W052 = 97 00
BGM_ODAMAKI = 7F 01 SE_W036 = 98 00
BGM_B_TOWER = 80 01 SE_W059 = 99 00
BGM_SWIMEYE = 81 01 SE_W059B = 9A 00
BGM_DAN03 = 82 01 SE_W010 = 9B 00
BGM_ME_KINOMI = 83 01 SE_W011 = 9C 00
BGM_ME_TAMA = 84 01 SE_W017 = 9D 00
BGM_ME_B_BIG = 85 01 SE_W019 = 9E 00
BGM_ME_B_SMALL = 86 01 SE_W028 = 9F 00
BGM_ME_ZANNEN = 87 01 SE_W013B = A0 00
BGM_BD_TIME = 88 01 SE_W044 = A1 00
BGM_TEST1 = 89 01 SE_W029 = A2 00
BGM_TEST2 = 8A 01 SE_W057 = A3 00
BGM_TEST3 = 8B 01 SE_W056 = A4 00
BGM_TEST4 = 8C 01 SE_W250 = A5 00
BGM_TEST = 8D 01 SE_W030 = A6 00
BGM_GOMACHI0 = 8E 01 SE_W039 = A7 00
BGM_GOTOWN = 8F 01 SE_W054 = A8 00
BGM_POKECEN = 90 01 SE_W077 = A9 00
BGM_NEXTROAD = 91 01 SE_W020 = AA 00
BGM_GRANROAD = 92 01 SE_W082 = AB 00
BGM_CYCLING = 93 01 SE_W047 = AC 00
BGM_FRIENDLY = 94 01 SE_W195 = AD 00
BGM_MISHIRO = 95 01 SE_W006 = AE 00
BGM_TOZAN = 96 01 SE_W091 = AF 00
BGM_GIRLEYE = 97 01 SE_W146 = B0 00
BGM_MINAMO = 98 01 SE_W120 = B1 00
BGM_ASHROAD = 99 01 SE_W153 = B2 00
BGM_EVENT0 = 9A 01 SE_W071B = B3 00
BGM_DEEPDEEP = 9B 01 SE_W071 = B4 00
BGM_KACHI1 = 9C 01 SE_W103 = B5 00
BGM_TITLE3 = 9D 01 SE_W062 = B6 00
BGM_DEMO1 = 9E 01 SE_W062B = B7 00
BGM_GIRL_SUP = 9F 01 SE_W048 = B8 00
BGM_HAGESHII = A0 01 SE_W187 = B9 00
BGM_KAKKOII = A1 01 SE_W118 = BA 00
BGM_KAZANBAI = A2 01 SE_W155 = BB 00
BGM_AQA_0 = A3 01 SE_W122 = BC 00
BGM_TSURETEK = A4 01 SE_W060 = BD 00
BGM_BOY_SUP = A5 01 SE_W185 = BE 00
BGM_RAINBOW = A6 01 SE_W014 = BF 00
BGM_AYASII = A7 01 SE_W043 = C0 00
BGM_KACHI4 = A8 01 SE_W207 = C1 00
BGM_ROPEWAY = A9 01 SE_W207B = C2 00
BGM_CASINO = AA 01 SE_W215 = C3 00
BGM_HIGHTOWN = AB 01 SE_W109 = C4 00
BGM_SAFARI = AC 01 SE_W173 = C5 00
BGM_C_ROAD = AD 01 SE_W280 = C6 00
BGM_AJITO = AE 01 SE_W202 = C7 00
BGM_M_BOAT = AF 01 SE_W060B = C8 00
BGM_M_DUNGON = B0 01 SE_W076 = C9 00
BGM_FINECITY = B1 01 SE_W080 = CA 00
BGM_MACHUPI = B2 01 SE_W100 = CB 00
BGM_P_SCHOOL = B3 01 SE_W107 = CC 00
BGM_DENDOU = B4 01 SE_W166 = CD 00
BGM_TONEKUSA = B5 01 SE_W129 = CE 00
BGM_MABOROSI = B6 01 SE_W115 = CF 00
BGM_CON_FAN = B7 01 SE_W112 = D0 00
BGM_CONTEST0 = B8 01 SE_W197 = D1 00
BGM_MGM0 = B9 01 SE_W199 = D2 00
BGM_T_BATTLE = BA 01 SE_W236 = D3 00
BGM_OOAME = BB 01 SE_W204 = D4 00
BGM_HIDERI = BC 01 SE_W268 = D5 00
BGM_RUNECITY = BD 01 SE_W070 = D6 00
BGM_CON_K = BE 01 SE_W063 = D7 00
BGM_EIKOU_R = BF 01 SE_W127 = D8 00
BGM_KARAKURI = C0 01 SE_W179 = D9 00
BGM_HUTAGO = C1 01 SE_W151 = DA 00
BGM_SITENNOU = C2 01 SE_W201 = DB 00
BGM_YAMA_EYE = C3 01 SE_W161 = DC 00
BGM_CONLOBBY = C4 01 SE_W161B = DD 00
BGM_INTER_V = C5 01 SE_W227 = DE 00
BGM_DAIGO = C6 01 SE_W227B = DF 00
BGM_THANKFOR = C7 01 SE_W226 = E0 00
BGM_END = C8 01 SE_W208 = E1 00
BGM_BATTLE27 = C9 01 SE_W213 = E2 00
BGM_BATTLE31 = CA 01 SE_W213B = E3 00
BGM_BATTLE20 = CB 01 SE_W234 = E4 00
BGM_BATTLE32 = CC 01 SE_W260 = E5 00
BGM_BATTLE33 = CD 01 SE_W328 = E6 00
BGM_BATTLE36 = CE 01 SE_W320 = E7 00
BGM_BATTLE34 = CF 01 SE_W255 = E8 00
BGM_BATTLE35 = D0 01 SE_W291 = E9 00
BGM_BATTLE38 = D1 01 SE_W089 = EA 00
BGM_BATTLE30 = D2 01 SE_W239 = EB 00
SE_W230 = EC 00
SE_W281 = ED 00
SE_W327 = EE 00
SE_W287 = EF 00
SE_W257 = F0 00
SE_W253 = F1 00
SE_W258 = F2 00
SE_W322 = F3 00
SE_W298 = F4 00
SE_W287B = F5 00
SE_W114 = F6 00
SE_W063B = F7 00
SE_RG_W_DOOR = F8 00
SE_RG_CARD1 = F9 00
SE_RG_CARD2 = FA 00
SE_RG_CARD3 = FB 00
SE_RG_BAG1 = FC 00
SE_RG_BAG2 = FD 00
SE_RG_GETTING = FE 00
SE_RG_SHOP = FF 00
SE_RG_KITEKI = 00 01
SE_RG_HELP_OP = 01 01
SE_RG_HELP_CL = 02 01
SE_RG_HELP_NG = 03 01
SE_RG_DEOMOV = 04 01
SE_RG_EXCELLENT = 05 01
SE_RG_NAWAMISS = 06 01
SE_TOREEYE = 07 01
SE_TOREOFF = 08 01
SE_HANTEI1 = 09 01
SE_HANTEI2 = 0A 01
SE_CURTAIN = 0B 01
SE_CURTAIN1 = 0C 01
SE_USSOKI = 0D 01
MUS_TETSUJI = 5E 01
MUS_FIELD13 = 5F 01
MUS_KACHI22 = 60 01
MUS_KACHI2 = 61 01
MUS_KACHI3 = 62 01
MUS_KACHI5 = 63 01
MUS_PCC = 64 01
MUS_NIBI = 65 01
MUS_SUIKUN = 66 01
MUS_DOORO1 = 67 01
MUS_DOORO_X1 = 68 01
MUS_DOORO_X3 = 69 01
MUS_MACHI_S2 = 6A 01
MUS_MACHI_S4 = 6B 01
MUS_GIM = 6C 01
MUS_NAMINORI = 6D 01
MUS_DAN01 = 6E 01
MUS_FANFA1 = 6F 01
MUS_ME_ASA = 70 01
MUS_ME_BACHI = 71 01
MUS_FANFA4 = 72 01
MUS_FANFA5 = 73 01
MUS_ME_WAZA = 74 01
MUS_BIJYUTU = 75 01
MUS_DOORO_X4 = 76 01
MUS_FUNE_KAN = 77 01
MUS_ME_SHINKA = 78 01
MUS_SHINKA = 79 01
MUS_ME_WASURE = 7A 01
MUS_SYOUJOEYE = 7B 01
MUS_BOYEYE = 7C 01
MUS_DAN02 = 7D 01
MUS_MACHI_S3 = 7E 01
MUS_ODAMAKI = 7F 01
MUS_B_TOWER = 80 01
MUS_SWIMEYE = 81 01
MUS_DAN03 = 82 01
MUS_ME_KINOMI = 83 01
MUS_ME_TAMA = 84 01
MUS_ME_B_BIG = 85 01
MUS_ME_B_SMALL = 86 01
MUS_ME_ZANNEN = 87 01
MUS_BD_TIME = 88 01
MUS_TEST1 = 89 01
MUS_TEST2 = 8A 01
MUS_TEST3 = 8B 01
MUS_TEST4 = 8C 01
MUS_TEST = 8D 01
MUS_GOMACHI0 = 8E 01
MUS_GOTOWN = 8F 01
MUS_POKECEN = 90 01
MUS_NEXTROAD = 91 01
MUS_GRANROAD = 92 01
MUS_CYCLING = 93 01
MUS_FRIENDLY = 94 01
MUS_MISHIRO = 95 01
MUS_TOZAN = 96 01
MUS_GIRLEYE = 97 01
MUS_MINAMO = 98 01
MUS_ASHROAD = 99 01
MUS_EVENT0 = 9A 01
MUS_DEEPDEEP = 9B 01
MUS_KACHI1 = 9C 01
MUS_TITLE3 = 9D 01
MUS_DEMO1 = 9E 01
MUS_GIRL_SUP = 9F 01
MUS_HAGESHII = A0 01
MUS_KAKKOII = A1 01
MUS_KAZANBAI = A2 01
MUS_AQA_0 = A3 01
MUS_TSURETEK = A4 01
MUS_BOY_SUP = A5 01
MUS_RAINBOW = A6 01
MUS_AYASII = A7 01
MUS_KACHI4 = A8 01
MUS_ROPEWAY = A9 01
MUS_CASINO = AA 01
MUS_HIGHTOWN = AB 01
MUS_SAFARI = AC 01
MUS_C_ROAD = AD 01
MUS_AJITO = AE 01
MUS_M_BOAT = AF 01
MUS_M_DUNGON = B0 01
MUS_FINECITY = B1 01
MUS_MACHUPI = B2 01
MUS_P_SCHOOL = B3 01
MUS_DENDOU = B4 01
MUS_TONEKUSA = B5 01
MUS_MABOROSI = B6 01
MUS_CON_FAN = B7 01
MUS_CONTEST0 = B8 01
MUS_MGM0 = B9 01
MUS_T_BATTLE = BA 01
MUS_OOAME = BB 01
MUS_HIDERI = BC 01
MUS_RUNECITY = BD 01
MUS_CON_K = BE 01
MUS_EIKOU_R = BF 01
MUS_KARAKURI = C0 01
MUS_HUTAGO = C1 01
MUS_SITENNOU = C2 01
MUS_YAMA_EYE = C3 01
MUS_CONLOBBY = C4 01
MUS_INTER_V = C5 01
MUS_DAIGO = C6 01
MUS_THANKFOR = C7 01
MUS_END = C8 01
MUS_B_FRONTIER = C9 01
MUS_B_ARENA = CA 01
MUS_ME_POINTGET = CB 01
MUS_ME_TORE_EYE = CC 01
MUS_PYRAMID = CD 01
MUS_PYRAMID_TOP = CE 01
MUS_B_PALACE = CF 01
MUS_REKKUU_KOURIN = D0 01
MUS_SATTOWER = D1 01
MUS_ME_SYMBOLGET = D2 01
MUS_B_DOME = D3 01
MUS_B_TUBE = D4 01
MUS_B_FACTORY = D5 01
MUS_VS_REKKU = D6 01
MUS_VS_FRONT = D7 01
MUS_VS_MEW = D8 01
MUS_B_DOME1 = D9 01
MUS_BATTLE27 = DA 01
MUS_BATTLE31 = DB 01
MUS_BATTLE20 = DC 01
MUS_BATTLE32 = DD 01
MUS_BATTLE33 = DE 01
MUS_BATTLE36 = DF 01
MUS_BATTLE34 = E0 01
MUS_BATTLE35 = E1 01
MUS_BATTLE38 = E2 01
MUS_BATTLE30 = E3 01
MUS_RG_ANNAI = E4 01
MUS_RG_SLOT = E5 01
MUS_RG_AJITO = E6 01
MUS_RG_GYM = E7 01
MUS_RG_PURIN = E8 01
MUS_RG_DEMO = E9 01
MUS_RG_TITLE = EA 01
MUS_RG_GUREN = EB 01
MUS_RG_SHION = EC 01
MUS_RG_KAIHUKU = ED 01
MUS_RG_CYCLING = EE 01
MUS_RG_ROCKET = EF 01
MUS_RG_SHOUJO = F0 01
MUS_RG_SHOUNEN = F1 01
MUS_RG_DENDOU = F2 01
MUS_RG_T_MORI = F3 01
MUS_RG_OTSUKIMI = F4 01
MUS_RG_POKEYASHI = F5 01
MUS_RG_ENDING = F6 01
MUS_RG_LOAD01 = F7 01
MUS_RG_OPENING = F8 01
MUS_RG_LOAD02 = F9 01
MUS_RG_LOAD03 = FA 01
MUS_RG_CHAMP_R = FB 01
MUS_RG_VS_GYM = FC 01
MUS_RG_VS_TORE = FD 01
MUS_RG_VS_YASEI = FE 01
MUS_RG_VS_LAST = FF 01
MUS_RG_MASARA = 00 02
MUS_RG_KENKYU = 01 02
MUS_RG_OHKIDO = 02 02
MUS_RG_POKECEN = 03 02
MUS_RG_SANTOAN = 04 02
MUS_RG_NAMINORI = 05 02
MUS_RG_P_TOWER = 06 02
MUS_RG_SHIRUHU = 07 02
MUS_RG_HANADA = 08 02
MUS_RG_TAMAMUSI = 09 02
MUS_RG_WIN_TRE = 0A 02
MUS_RG_WIN_YASEI = 0B 02
MUS_RG_WIN_GYM = 0C 02
MUS_RG_KUCHIBA = 0D 02
MUS_RG_NIBI = 0E 02
MUS_RG_RIVAL1 = 0F 02
MUS_RG_RIVAL2 = 10 02
MUS_RG_FAN2 = 11 02
MUS_RG_FAN5 = 12 02
MUS_RG_FAN6 = 13 02
MUS_ME_RG_PHOTO = 14 02
MUS_RG_TITLEROG = 15 02
MUS_RG_GET_YASEI = 16 02
MUS_RG_SOUSA = 17 02
MUS_RG_SEKAIKAN = 18 02
MUS_RG_SEIBETU = 19 02
MUS_RG_JUMP = 1A 02
MUS_RG_UNION = 1B 02
MUS_RG_NETWORK = 1C 02
MUS_RG_OKURIMONO = 1D 02
MUS_RG_KINOMIKUI = 1E 02
MUS_RG_NANADUNGEON = 1F 02
MUS_RG_OSHIE_TV = 20 02
MUS_RG_NANASHIMA = 21 02
MUS_RG_NANAISEKI = 22 02
MUS_RG_NANA123 = 23 02
MUS_RG_NANA45 = 24 02
MUS_RG_NANA67 = 25 02
MUS_RG_POKEFUE = 26 02
MUS_RG_VS_DEO = 27 02
MUS_RG_VS_MYU2 = 28 02
MUS_RG_VS_DEN = 29 02
MUS_RG_EXEYE = 2A 02
MUS_RG_DEOEYE = 2B 02
MUS_RG_T_TOWER = 2C 02
MUS_RG_SLOWMASARA = 2D 02
MUS_RG_TVNOIZE = 2E 02
PH_TRAP_BLEND = 2F 02
PH_TRAP_HELD = 30 02
PH_TRAP_SOLO = 31 02
PH_FACE_BLEND = 32 02
PH_FACE_HELD = 33 02
PH_FACE_SOLO = 34 02
PH_CLOTH_BLEND = 35 02
PH_CLOTH_HELD = 36 02
PH_CLOTH_SOLO = 37 02
PH_DRESS_BLEND = 38 02
PH_DRESS_HELD = 39 02
PH_DRESS_SOLO = 3A 02
PH_FLEECE_BLEND = 3B 02
PH_FLEECE_HELD = 3C 02
PH_FLEECE_SOLO = 3D 02
PH_KIT_BLEND = 3E 02
PH_KIT_HELD = 3F 02
PH_KIT_SOLO = 40 02
PH_PRICE_BLEND = 41 02
PH_PRICE_HELD = 42 02
PH_PRICE_SOLO = 43 02
PH_LOT_BLEND = 44 02
PH_LOT_HELD = 45 02
PH_LOT_SOLO = 46 02
PH_GOAT_BLEND = 47 02
PH_GOAT_HELD = 48 02
PH_GOAT_SOLO = 49 02
PH_THOUGHT_BLEND = 4A 02
PH_THOUGHT_HELD = 4B 02
PH_THOUGHT_SOLO = 4C 02
PH_CHOICE_BLEND = 4D 02
PH_CHOICE_HELD = 4E 02
PH_CHOICE_SOLO = 4F 02
PH_MOUTH_BLEND = 50 02
PH_MOUTH_HELD = 51 02
PH_MOUTH_SOLO = 52 02
PH_FOOT_BLEND = 53 02
PH_FOOT_HELD = 54 02
PH_FOOT_SOLO = 55 02
PH_GOOSE_BLEND = 56 02
PH_GOOSE_HELD = 57 02
PH_GOOSE_SOLO = 58 02
PH_STRUT_BLEND = 59 02
PH_STRUT_HELD = 5A 02
PH_STRUT_SOLO = 5B 02
PH_CURE_BLEND = 5C 02
PH_CURE_HELD = 5D 02
PH_CURE_SOLO = 5E 02
PH_NURSE_BLEND = 5F 02
PH_NURSE_HELD = 60 02
PH_NURSE_SOLO = 61 02
UNK_CTRL_F800 = F8 00 UNK_CTRL_F800 = F8 00
UNK_CTRL_F801 = F8 01 UNK_CTRL_F801 = F8 01
data/battle_frontier_1.s
+10 -4
View File
@@ -1,3 +1,5 @@
#include "constants/flags.h"
.include "asm/macros.inc" .include "asm/macros.inc"
.include "constants/constants.inc" .include "constants/constants.inc"
@@ -1391,10 +1393,14 @@ gUnknown_0860EFF4:: @ 860EFF4
.4byte gText_BattlePyramid .4byte gText_BattlePyramid
gUnknown_0860F010:: @ 860F010 gUnknown_0860F010:: @ 860F010
.4byte gUnknown_08680867 .2byte FLAG_BADGE01_GET
.4byte gUnknown_086A0869 .2byte FLAG_BADGE02_GET
.4byte gUnknown_086C086B .2byte FLAG_BADGE03_GET
.4byte gUnknown_086E086D .2byte FLAG_BADGE04_GET
.2byte FLAG_BADGE05_GET
.2byte FLAG_BADGE06_GET
.2byte FLAG_BADGE07_GET
.2byte FLAG_BADGE08_GET
gUnknown_0860F020:: @ 860F020 gUnknown_0860F020:: @ 860F020
.4byte gUnknown_082A5D6C .4byte gUnknown_082A5D6C
data/battle_scripts_1.s
+2 -2
View File
@@ -3177,7 +3177,7 @@ BattleScript_Pausex20::
return return
BattleScript_LevelUp:: BattleScript_LevelUp::
fanfare BGM_FANFA1 fanfare MUS_FANFA1
printstring STRINGID_PKMNGREWTOLV printstring STRINGID_PKMNGREWTOLV
setbyte sLVLBOX_STATE, 0x0 setbyte sLVLBOX_STATE, 0x0
drawlvlupbox drawlvlupbox
@@ -3205,7 +3205,7 @@ BattleScript_ForgotAndLearnedNewMove::
printstring STRINGID_ANDELLIPSIS printstring STRINGID_ANDELLIPSIS
BattleScript_LearnedNewMove:: BattleScript_LearnedNewMove::
buffermovetolearn buffermovetolearn
fanfare BGM_FANFA1 fanfare MUS_FANFA1
printstring STRINGID_PKMNLEARNEDMOVE printstring STRINGID_PKMNLEARNEDMOVE
waitmessage 0x40 waitmessage 0x40
updatechoicemoveonlvlup ATTACKER updatechoicemoveonlvlup ATTACKER
data/data4c.s → data/data4d.s
-55
View File
@@ -5,60 +5,6 @@
.section .rodata .section .rodata
gPokeblockFlavorCompatibilityTable:: @ 85B25A0
.incbin "baserom.gba", 0x5b25a0, 0x80
gUnknown_085B2620:: @ 85B2620
.incbin "baserom.gba", 0x5b2620, 0xc
gPokeblockNames:: @ 85B262C
.incbin "baserom.gba", 0x5b262c, 0x3c
gUnknown_085B2668:: @ 85B2668
.incbin "baserom.gba", 0x5b2668, 0x30
gUnknown_085B2698:: @ 85B2698
.incbin "baserom.gba", 0x5b2698, 0x3
gUnknown_085B269B:: @ 85B269B
.incbin "baserom.gba", 0x5b269b, 0x2
gUnknown_085B269D:: @ 85B269D
.incbin "baserom.gba", 0x5b269d, 0x2
gUnknown_085B269F:: @ 85B269F
.incbin "baserom.gba", 0x5b269f, 0x5
gUnknown_085B26A4:: @ 85B26A4
.incbin "baserom.gba", 0x5b26a4, 0x4c
gUnknown_085B26F0:: @ 85B26F0
.incbin "baserom.gba", 0x5b26f0, 0x4
gUnknown_085B26F4:: @ 85B26F4
.incbin "baserom.gba", 0x5b26f4, 0x8
gUnknown_085B26FC:: @ 85B26FC
.incbin "baserom.gba", 0x5b26fc, 0x8
gUnknown_085B2704:: @ 85B2704
.incbin "baserom.gba", 0x5b2704, 0x18
gUnknown_085B271C:: @ 85B271C
.incbin "baserom.gba", 0x5b271c, 0x4
gUnknown_085B2720:: @ 85B2720
.incbin "baserom.gba", 0x5b2720, 0x28
gUnknown_085B2748:: @ 85B2748
.incbin "baserom.gba", 0x5b2748, 0x60
gUnknown_085B27A8:: @ 85B27A8
.incbin "baserom.gba", 0x5b27a8, 0x8
gUnknown_085B27B0:: @ 85B27B0
.incbin "baserom.gba", 0x5b27b0, 0x18
gUnknown_085B27C8:: @ 85B27C8 gUnknown_085B27C8:: @ 85B27C8
.incbin "baserom.gba", 0x5b27c8, 0x88 .incbin "baserom.gba", 0x5b27c8, 0x88
@@ -797,4 +743,3 @@ gUnknown_085C9A30:: @ 85C9A30
gUnknown_085C9A53:: @ 85C9A53 gUnknown_085C9A53:: @ 85C9A53
.incbin "baserom.gba", 0x5c9a53, 0x41 .incbin "baserom.gba", 0x5c9a53, 0x41
data/event_scripts.s
+367 -367
View File
File diff suppressed because it is too large Load Diff
data/graphics.s
+71 -5
View File
@@ -880,14 +880,80 @@ gBuyMenuFrame_Tilemap:: @ 8D9B0F0
gMenuMoneyGfx:: @ 8D9B230 gMenuMoneyGfx:: @ 8D9B230
.incbin "baserom.gba", 0xd9b230, 0x84 .incbin "baserom.gba", 0xd9b230, 0x84
gUnknown_08D9B2B4:: @ 8D9B2B4 gMenuPokeblock_Gfx:: @ 8D9B2B4
.incbin "baserom.gba", 0xd9b2b4, 0x1bc .incbin "baserom.gba", 0xd9b2b4, 0x1bc
gUnknown_08D9B470:: @ 8D9B470 gMenuPokeblock_Pal:: @ 8D9B470
.incbin "baserom.gba", 0xd9b470, 0x358 .incbin "baserom.gba", 0xd9b470, 0x70
gMenuPokeblockDevice_Gfx:: @ 8D9B4E0
.incbin "baserom.gba", 0xd9b4e0, 0x2c0
gMenuPokeblockDevice_Pal:: @ 8D9B7A0
.incbin "baserom.gba", 0xd9b7a0, 0x28
gUnknown_08D9B7C8:: @ 8D9B7C8 gMenuPokeblock_Tilemap:: @ 8D9B7C8
.incbin "baserom.gba", 0xd9b7c8, 0x27c .incbin "baserom.gba", 0xd9b7c8, 0x148
.align 2
gPokeblock_Gfx::
.incbin "graphics/pokeblock/pokeblock.4bpp.lz"
.align 2
gPokeblockRed_Pal::
.incbin "graphics/pokeblock/red.gbapal.lz"
.align 2
gPokeblockBlue_Pal::
.incbin "graphics/pokeblock/blue.gbapal.lz"
.align 2
gPokeblockPink_Pal::
.incbin "graphics/pokeblock/pink.gbapal.lz"
.align 2
gPokeblockGreen_Pal::
.incbin "graphics/pokeblock/green.gbapal.lz"
.align 2
gPokeblockYellow_Pal::
.incbin "graphics/pokeblock/yellow.gbapal.lz"
.align 2
gPokeblockPurple_Pal::
.incbin "graphics/pokeblock/purple.gbapal.lz"
.align 2
gPokeblockIndigo_Pal::
.incbin "graphics/pokeblock/indigo.gbapal.lz"
.align 2
gPokeblockBrown_Pal::
.incbin "graphics/pokeblock/brown.gbapal.lz"
.align 2
gPokeblockLiteBlue_Pal::
.incbin "graphics/pokeblock/liteblue.gbapal.lz"
.align 2
gPokeblockOlive_Pal::
.incbin "graphics/pokeblock/olive.gbapal.lz"
.align 2
gPokeblockGray_Pal::
.incbin "graphics/pokeblock/gray.gbapal.lz"
.align 2
gPokeblockBlack_Pal::
.incbin "graphics/pokeblock/black.gbapal.lz"
.align 2
gPokeblockWhite_Pal::
.incbin "graphics/pokeblock/white.gbapal.lz"
.align 2
gPokeblockGold_Pal::
.incbin "graphics/pokeblock/gold.gbapal.lz"
gUnknown_08D9BA44:: @ 8D9BA44 gUnknown_08D9BA44:: @ 8D9BA44
.incbin "baserom.gba", 0xd9ba44, 0x100 .incbin "baserom.gba", 0xd9ba44, 0x100
data/maps/AbandonedShip_CaptainsOffice/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ AbandonedShip_CaptainsOffice: @ 84845A4
.4byte AbandonedShip_CaptainsOffice_MapEvents .4byte AbandonedShip_CaptainsOffice_MapEvents
.4byte AbandonedShip_CaptainsOffice_MapScripts .4byte AbandonedShip_CaptainsOffice_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_DAN02 .2byte MUS_DAN02
.2byte 195 .2byte 195
.byte 61 .byte 61
.byte 0 .byte 0
data/maps/AbandonedShip_Corridors_1F/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ AbandonedShip_Corridors_1F: @ 84844C4
.4byte AbandonedShip_Corridors_1F_MapEvents .4byte AbandonedShip_Corridors_1F_MapEvents
.4byte AbandonedShip_Corridors_1F_MapScripts .4byte AbandonedShip_Corridors_1F_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_DAN02 .2byte MUS_DAN02
.2byte 187 .2byte 187
.byte 61 .byte 61
.byte 0 .byte 0
data/maps/AbandonedShip_Corridors_B1F/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ AbandonedShip_Corridors_B1F: @ 84844FC
.4byte AbandonedShip_Corridors_B1F_MapEvents .4byte AbandonedShip_Corridors_B1F_MapEvents
.4byte AbandonedShip_Corridors_B1F_MapScripts .4byte AbandonedShip_Corridors_B1F_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_DAN02 .2byte MUS_DAN02
.2byte 189 .2byte 189
.byte 61 .byte 61
.byte 0 .byte 0
data/maps/AbandonedShip_Deck/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ AbandonedShip_Deck: @ 84844A8
.4byte AbandonedShip_Deck_MapEvents .4byte AbandonedShip_Deck_MapEvents
.4byte AbandonedShip_Deck_MapScripts .4byte AbandonedShip_Deck_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_DAN02 .2byte MUS_DAN02
.2byte 186 .2byte 186
.byte 61 .byte 61
.byte 0 .byte 0
data/maps/AbandonedShip_HiddenFloorCorridors/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ AbandonedShip_HiddenFloorCorridors: @ 84845DC
.4byte AbandonedShip_HiddenFloorCorridors_MapEvents .4byte AbandonedShip_HiddenFloorCorridors_MapEvents
.4byte AbandonedShip_HiddenFloorCorridors_MapScripts .4byte AbandonedShip_HiddenFloorCorridors_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_DAN02 .2byte MUS_DAN02
.2byte 289 .2byte 289
.byte 61 .byte 61
.byte 0 .byte 0
data/maps/AbandonedShip_HiddenFloorRooms/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ AbandonedShip_HiddenFloorRooms: @ 84845F8
.4byte AbandonedShip_HiddenFloorRooms_MapEvents .4byte AbandonedShip_HiddenFloorRooms_MapEvents
.4byte AbandonedShip_HiddenFloorRooms_MapScripts .4byte AbandonedShip_HiddenFloorRooms_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_DAN02 .2byte MUS_DAN02
.2byte 310 .2byte 310
.byte 61 .byte 61
.byte 0 .byte 0
data/maps/AbandonedShip_Room_B1F/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ AbandonedShip_Room_B1F: @ 848456C
.4byte AbandonedShip_Room_B1F_MapEvents .4byte AbandonedShip_Room_B1F_MapEvents
.4byte AbandonedShip_Room_B1F_MapScripts .4byte AbandonedShip_Room_B1F_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_DAN02 .2byte MUS_DAN02
.2byte 193 .2byte 193
.byte 61 .byte 61
.byte 0 .byte 0
data/maps/AbandonedShip_Rooms2_1F/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ AbandonedShip_Rooms2_1F: @ 8484588
.4byte AbandonedShip_Rooms2_1F_MapEvents .4byte AbandonedShip_Rooms2_1F_MapEvents
.4byte AbandonedShip_Rooms2_1F_MapScripts .4byte AbandonedShip_Rooms2_1F_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_DAN02 .2byte MUS_DAN02
.2byte 194 .2byte 194
.byte 61 .byte 61
.byte 0 .byte 0
data/maps/AbandonedShip_Rooms2_B1F/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ AbandonedShip_Rooms2_B1F: @ 8484534
.4byte AbandonedShip_Rooms2_B1F_MapEvents .4byte AbandonedShip_Rooms2_B1F_MapEvents
.4byte AbandonedShip_Rooms2_B1F_MapScripts .4byte AbandonedShip_Rooms2_B1F_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_DAN02 .2byte MUS_DAN02
.2byte 191 .2byte 191
.byte 61 .byte 61
.byte 0 .byte 0
data/maps/AbandonedShip_Rooms_1F/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ AbandonedShip_Rooms_1F: @ 84844E0
.4byte AbandonedShip_Rooms_1F_MapEvents .4byte AbandonedShip_Rooms_1F_MapEvents
.4byte AbandonedShip_Rooms_1F_MapScripts .4byte AbandonedShip_Rooms_1F_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_DAN02 .2byte MUS_DAN02
.2byte 188 .2byte 188
.byte 61 .byte 61
.byte 0 .byte 0
data/maps/AbandonedShip_Rooms_B1F/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ AbandonedShip_Rooms_B1F: @ 8484518
.4byte AbandonedShip_Rooms_B1F_MapEvents .4byte AbandonedShip_Rooms_B1F_MapEvents
.4byte AbandonedShip_Rooms_B1F_MapScripts .4byte AbandonedShip_Rooms_B1F_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_DAN02 .2byte MUS_DAN02
.2byte 190 .2byte 190
.byte 61 .byte 61
.byte 0 .byte 0
data/maps/AbandonedShip_Underwater1/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ AbandonedShip_Underwater1: @ 8484550
.4byte AbandonedShip_Underwater1_MapEvents .4byte AbandonedShip_Underwater1_MapEvents
.4byte AbandonedShip_Underwater1_MapScripts .4byte AbandonedShip_Underwater1_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_DEEPDEEP .2byte MUS_DEEPDEEP
.2byte 192 .2byte 192
.byte 61 .byte 61
.byte 0 .byte 0
data/maps/AbandonedShip_Underwater2/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ AbandonedShip_Underwater2: @ 84845C0
.4byte AbandonedShip_Underwater2_MapEvents .4byte AbandonedShip_Underwater2_MapEvents
.4byte AbandonedShip_Underwater2_MapScripts .4byte AbandonedShip_Underwater2_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_DEEPDEEP .2byte MUS_DEEPDEEP
.2byte 196 .2byte 196
.byte 61 .byte 61
.byte 0 .byte 0
data/maps/AlteringCave/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ AlteringCave: @ 8484A58
.4byte AlteringCave_MapEvents .4byte AlteringCave_MapEvents
.4byte AlteringCave_MapScripts .4byte AlteringCave_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_FRLG_MT_EMBER .2byte MUS_RG_NANADUNGEON
.2byte 420 .2byte 420
.byte 210 .byte 210
.byte 0 .byte 0
data/maps/AncientTomb/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ AncientTomb: @ 8484630
.4byte AncientTomb_MapEvents .4byte AncientTomb_MapEvents
.4byte AncientTomb_MapScripts .4byte AncientTomb_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_MABOROSI .2byte MUS_MABOROSI
.2byte 281 .2byte 281
.byte 83 .byte 83
.byte 0 .byte 0
data/maps/AquaHideout_1F/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ AquaHideout_1F: @ 8484144
.4byte AquaHideout_1F_MapEvents .4byte AquaHideout_1F_MapEvents
.4byte AquaHideout_1F_MapScripts .4byte AquaHideout_1F_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_AJITO .2byte MUS_AJITO
.2byte 143 .2byte 143
.byte 197 .byte 197
.byte 0 .byte 0
data/maps/AquaHideout_B1F/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ AquaHideout_B1F: @ 8484160
.4byte AquaHideout_B1F_MapEvents .4byte AquaHideout_B1F_MapEvents
.4byte AquaHideout_B1F_MapScripts .4byte AquaHideout_B1F_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_AJITO .2byte MUS_AJITO
.2byte 144 .2byte 144
.byte 197 .byte 197
.byte 0 .byte 0
data/maps/AquaHideout_B2F/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ AquaHideout_B2F: @ 848417C
.4byte AquaHideout_B2F_MapEvents .4byte AquaHideout_B2F_MapEvents
.4byte AquaHideout_B2F_MapScripts .4byte AquaHideout_B2F_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_AJITO .2byte MUS_AJITO
.2byte 145 .2byte 145
.byte 197 .byte 197
.byte 0 .byte 0
data/maps/AquaHideout_UnusedRubyMap1/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ AquaHideout_UnusedRubyMap1: @ 84846D8
.4byte AquaHideout_UnusedRubyMap1_MapEvents .4byte AquaHideout_UnusedRubyMap1_MapEvents
.4byte AquaHideout_UnusedRubyMap1_MapScripts .4byte AquaHideout_UnusedRubyMap1_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_AJITO .2byte MUS_AJITO
.2byte 316 .2byte 316
.byte 197 .byte 197
.byte 0 .byte 0
data/maps/AquaHideout_UnusedRubyMap2/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ AquaHideout_UnusedRubyMap2: @ 84846F4
.4byte AquaHideout_UnusedRubyMap2_MapEvents .4byte AquaHideout_UnusedRubyMap2_MapEvents
.4byte AquaHideout_UnusedRubyMap2_MapScripts .4byte AquaHideout_UnusedRubyMap2_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_AJITO .2byte MUS_AJITO
.2byte 317 .2byte 317
.byte 197 .byte 197
.byte 0 .byte 0
data/maps/AquaHideout_UnusedRubyMap3/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ AquaHideout_UnusedRubyMap3: @ 8484710
.4byte AquaHideout_UnusedRubyMap3_MapEvents .4byte AquaHideout_UnusedRubyMap3_MapEvents
.4byte AquaHideout_UnusedRubyMap3_MapScripts .4byte AquaHideout_UnusedRubyMap3_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_AJITO .2byte MUS_AJITO
.2byte 318 .2byte 318
.byte 197 .byte 197
.byte 0 .byte 0
data/maps/ArtisanCave_1F/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ ArtisanCave_1F: @ 84849B0
.4byte ArtisanCave_1F_MapEvents .4byte ArtisanCave_1F_MapEvents
.4byte ArtisanCave_1F_MapScripts .4byte ArtisanCave_1F_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_DAN01 .2byte MUS_DAN01
.2byte 401 .2byte 401
.byte 202 .byte 202
.byte 0 .byte 0
data/maps/ArtisanCave_B1F/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ ArtisanCave_B1F: @ 8484994
.4byte ArtisanCave_B1F_MapEvents .4byte ArtisanCave_B1F_MapEvents
.4byte ArtisanCave_B1F_MapScripts .4byte ArtisanCave_B1F_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_DAN01 .2byte MUS_DAN01
.2byte 400 .2byte 400
.byte 202 .byte 202
.byte 0 .byte 0
data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_BattleArenaBattleRoom: @ 8485484
.4byte BattleFrontier_BattleArenaBattleRoom_MapEvents .4byte BattleFrontier_BattleArenaBattleRoom_MapEvents
.4byte BattleFrontier_BattleArenaBattleRoom_MapScripts .4byte BattleFrontier_BattleArenaBattleRoom_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_BATTLE_ARENA .2byte MUS_B_ARENA
.2byte 356 .2byte 356
.byte 58 .byte 58
.byte 0 .byte 0
data/maps/BattleFrontier_BattleArenaCorridor/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_BattleArenaCorridor: @ 8485468
.4byte BattleFrontier_BattleArenaCorridor_MapEvents .4byte BattleFrontier_BattleArenaCorridor_MapEvents
.4byte BattleFrontier_BattleArenaCorridor_MapScripts .4byte BattleFrontier_BattleArenaCorridor_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_BATTLE_ARENA .2byte MUS_B_ARENA
.2byte 355 .2byte 355
.byte 58 .byte 58
.byte 0 .byte 0
data/maps/BattleFrontier_BattleArenaLobby/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_BattleArenaLobby: @ 848544C
.4byte BattleFrontier_BattleArenaLobby_MapEvents .4byte BattleFrontier_BattleArenaLobby_MapEvents
.4byte BattleFrontier_BattleArenaLobby_MapScripts .4byte BattleFrontier_BattleArenaLobby_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_BATTLE_ARENA .2byte MUS_B_ARENA
.2byte 354 .2byte 354
.byte 58 .byte 58
.byte 0 .byte 0
data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_BattleDomeBattleRoom: @ 8485388
.4byte BattleFrontier_BattleDomeBattleRoom_MapEvents .4byte BattleFrontier_BattleDomeBattleRoom_MapEvents
.4byte BattleFrontier_BattleDomeBattleRoom_MapScripts .4byte BattleFrontier_BattleDomeBattleRoom_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_BATTLE_DOME_TOURNAMENT .2byte MUS_B_DOME
.2byte 335 .2byte 335
.byte 58 .byte 58
.byte 0 .byte 0
data/maps/BattleFrontier_BattleDomeCorridor/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_BattleDomeCorridor: @ 8485350
.4byte BattleFrontier_BattleDomeCorridor_MapEvents .4byte BattleFrontier_BattleDomeCorridor_MapEvents
.4byte BattleFrontier_BattleDomeCorridor_MapScripts .4byte BattleFrontier_BattleDomeCorridor_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_BATTLE_DOME .2byte MUS_B_DOME1
.2byte 333 .2byte 333
.byte 58 .byte 58
.byte 0 .byte 0
data/maps/BattleFrontier_BattleDomeLobby/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_BattleDomeLobby: @ 8485334
.4byte BattleFrontier_BattleDomeLobby_MapEvents .4byte BattleFrontier_BattleDomeLobby_MapEvents
.4byte BattleFrontier_BattleDomeLobby_MapScripts .4byte BattleFrontier_BattleDomeLobby_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_BATTLE_DOME .2byte MUS_B_DOME1
.2byte 332 .2byte 332
.byte 58 .byte 58
.byte 0 .byte 0
data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_BattleDomePreBattleRoom: @ 848536C
.4byte BattleFrontier_BattleDomePreBattleRoom_MapEvents .4byte BattleFrontier_BattleDomePreBattleRoom_MapEvents
.4byte BattleFrontier_BattleDomePreBattleRoom_MapScripts .4byte BattleFrontier_BattleDomePreBattleRoom_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_BATTLE_DOME_TOURNAMENT .2byte MUS_B_DOME
.2byte 334 .2byte 334
.byte 58 .byte 58
.byte 0 .byte 0
data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_BattleFactoryBattleRoom: @ 84854D8
.4byte BattleFrontier_BattleFactoryBattleRoom_MapEvents .4byte BattleFrontier_BattleFactoryBattleRoom_MapEvents
.4byte BattleFrontier_BattleFactoryBattleRoom_MapScripts .4byte BattleFrontier_BattleFactoryBattleRoom_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_BATTLE_FACTORY .2byte MUS_B_FACTORY
.2byte 348 .2byte 348
.byte 58 .byte 58
.byte 0 .byte 0
data/maps/BattleFrontier_BattleFactoryLobby/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_BattleFactoryLobby: @ 84854A0
.4byte BattleFrontier_BattleFactoryLobby_MapEvents .4byte BattleFrontier_BattleFactoryLobby_MapEvents
.4byte BattleFrontier_BattleFactoryLobby_MapScripts .4byte BattleFrontier_BattleFactoryLobby_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_BATTLE_FACTORY .2byte MUS_B_FACTORY
.2byte 346 .2byte 346
.byte 58 .byte 58
.byte 0 .byte 0
data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_BattleFactoryPreBattleRoom: @ 84854BC
.4byte BattleFrontier_BattleFactoryPreBattleRoom_MapEvents .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapEvents
.4byte BattleFrontier_BattleFactoryPreBattleRoom_MapScripts .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_BATTLE_FACTORY .2byte MUS_B_FACTORY
.2byte 347 .2byte 347
.byte 58 .byte 58
.byte 0 .byte 0
data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_BattlePalaceBattleRoom: @ 84853DC
.4byte BattleFrontier_BattlePalaceBattleRoom_MapEvents .4byte BattleFrontier_BattlePalaceBattleRoom_MapEvents
.4byte BattleFrontier_BattlePalaceBattleRoom_MapScripts .4byte BattleFrontier_BattlePalaceBattleRoom_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_BATTLE_PALACE .2byte MUS_B_PALACE
.2byte 344 .2byte 344
.byte 58 .byte 58
.byte 0 .byte 0
data/maps/BattleFrontier_BattlePalaceCorridor/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_BattlePalaceCorridor: @ 84853C0
.4byte BattleFrontier_BattlePalaceCorridor_MapEvents .4byte BattleFrontier_BattlePalaceCorridor_MapEvents
.4byte BattleFrontier_BattlePalaceCorridor_MapScripts .4byte BattleFrontier_BattlePalaceCorridor_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_BATTLE_PALACE .2byte MUS_B_PALACE
.2byte 343 .2byte 343
.byte 58 .byte 58
.byte 0 .byte 0
data/maps/BattleFrontier_BattlePalaceLobby/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_BattlePalaceLobby: @ 84853A4
.4byte BattleFrontier_BattlePalaceLobby_MapEvents .4byte BattleFrontier_BattlePalaceLobby_MapEvents
.4byte BattleFrontier_BattlePalaceLobby_MapScripts .4byte BattleFrontier_BattlePalaceLobby_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_BATTLE_PALACE .2byte MUS_B_PALACE
.2byte 342 .2byte 342
.byte 58 .byte 58
.byte 0 .byte 0
data/maps/BattleFrontier_BattlePikeCorridor/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_BattlePikeCorridor: @ 8485510
.4byte BattleFrontier_BattlePikeCorridor_MapEvents .4byte BattleFrontier_BattlePikeCorridor_MapEvents
.4byte BattleFrontier_BattlePikeCorridor_MapScripts .4byte BattleFrontier_BattlePikeCorridor_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_BATTLE_PIKE .2byte MUS_B_TUBE
.2byte 350 .2byte 350
.byte 58 .byte 58
.byte 0 .byte 0
data/maps/BattleFrontier_BattlePikeLobby/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_BattlePikeLobby: @ 84854F4
.4byte BattleFrontier_BattlePikeLobby_MapEvents .4byte BattleFrontier_BattlePikeLobby_MapEvents
.4byte BattleFrontier_BattlePikeLobby_MapScripts .4byte BattleFrontier_BattlePikeLobby_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_BATTLE_PIKE .2byte MUS_B_TUBE
.2byte 349 .2byte 349
.byte 58 .byte 58
.byte 0 .byte 0
data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_BattlePikeRandomRoom1: @ 8485548
.4byte BattleFrontier_BattlePikeRandomRoom1_MapEvents .4byte BattleFrontier_BattlePikeRandomRoom1_MapEvents
.4byte BattleFrontier_BattlePikeRandomRoom1_MapScripts .4byte BattleFrontier_BattlePikeRandomRoom1_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_BATTLE_PIKE .2byte MUS_B_TUBE
.2byte 352 .2byte 352
.byte 58 .byte 58
.byte 0 .byte 0
data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_BattlePikeRandomRoom2: @ 8485564
.4byte BattleFrontier_BattlePikeRandomRoom2_MapEvents .4byte BattleFrontier_BattlePikeRandomRoom2_MapEvents
.4byte BattleFrontier_BattlePikeRandomRoom2_MapScripts .4byte BattleFrontier_BattlePikeRandomRoom2_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_BATTLE_PIKE .2byte MUS_B_TUBE
.2byte 353 .2byte 353
.byte 58 .byte 58
.byte 0 .byte 0
data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_BattlePikeRandomRoom3: @ 8485580
.4byte BattleFrontier_BattlePikeRandomRoom3_MapEvents .4byte BattleFrontier_BattlePikeRandomRoom3_MapEvents
.4byte BattleFrontier_BattlePikeRandomRoom3_MapScripts .4byte BattleFrontier_BattlePikeRandomRoom3_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_BATTLE_PIKE .2byte MUS_B_TUBE
.2byte 358 .2byte 358
.byte 58 .byte 58
.byte 0 .byte 0
data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_BattlePikeThreePathRoom: @ 848552C
.4byte BattleFrontier_BattlePikeThreePathRoom_MapEvents .4byte BattleFrontier_BattlePikeThreePathRoom_MapEvents
.4byte BattleFrontier_BattlePikeThreePathRoom_MapScripts .4byte BattleFrontier_BattlePikeThreePathRoom_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_BATTLE_PIKE .2byte MUS_B_TUBE
.2byte 351 .2byte 351
.byte 58 .byte 58
.byte 0 .byte 0
data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_BattlePointExchangeServiceCorner: @ 84855D4
.4byte BattleFrontier_BattlePointExchangeServiceCorner_MapEvents .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapEvents
.4byte BattleFrontier_BattlePointExchangeServiceCorner_MapScripts .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_B_TOWER .2byte MUS_B_TOWER
.2byte 398 .2byte 398
.byte 58 .byte 58
.byte 0 .byte 0
data/maps/BattleFrontier_BattlePyramidLobby/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_BattlePyramidLobby: @ 84853F8
.4byte BattleFrontier_BattlePyramidLobby_MapEvents .4byte BattleFrontier_BattlePyramidLobby_MapEvents
.4byte BattleFrontier_BattlePyramidLobby_MapScripts .4byte BattleFrontier_BattlePyramidLobby_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_BATTLE_PYRAMID .2byte MUS_PYRAMID
.2byte 360 .2byte 360
.byte 58 .byte 58
.byte 0 .byte 0
data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_BattleTowerBattleRoom: @ 848521C
.4byte BattleFrontier_BattleTowerBattleRoom_MapEvents .4byte BattleFrontier_BattleTowerBattleRoom_MapEvents
.4byte BattleFrontier_BattleTowerBattleRoom_MapScripts .4byte BattleFrontier_BattleTowerBattleRoom_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_BATTLE_TOWER .2byte MUS_SATTOWER
.2byte 268 .2byte 268
.byte 58 .byte 58
.byte 0 .byte 0
data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_BattleTowerBattleRoom2: @ 8485318
.4byte BattleFrontier_BattleTowerBattleRoom2_MapEvents .4byte BattleFrontier_BattleTowerBattleRoom2_MapEvents
.4byte BattleFrontier_BattleTowerBattleRoom2_MapScripts .4byte BattleFrontier_BattleTowerBattleRoom2_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_BATTLE_TOWER .2byte MUS_SATTOWER
.2byte 268 .2byte 268
.byte 58 .byte 58
.byte 0 .byte 0
data/maps/BattleFrontier_BattleTowerCorridor/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_BattleTowerCorridor: @ 8485200
.4byte BattleFrontier_BattleTowerCorridor_MapEvents .4byte BattleFrontier_BattleTowerCorridor_MapEvents
.4byte BattleFrontier_BattleTowerCorridor_MapScripts .4byte BattleFrontier_BattleTowerCorridor_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_BATTLE_TOWER .2byte MUS_SATTOWER
.2byte 267 .2byte 267
.byte 58 .byte 58
.byte 0 .byte 0
data/maps/BattleFrontier_BattleTowerCorridor2/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_BattleTowerCorridor2: @ 84852FC
.4byte BattleFrontier_BattleTowerCorridor2_MapEvents .4byte BattleFrontier_BattleTowerCorridor2_MapEvents
.4byte BattleFrontier_BattleTowerCorridor2_MapScripts .4byte BattleFrontier_BattleTowerCorridor2_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_BATTLE_TOWER .2byte MUS_SATTOWER
.2byte 391 .2byte 391
.byte 58 .byte 58
.byte 0 .byte 0
data/maps/BattleFrontier_BattleTowerElevator/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_BattleTowerElevator: @ 84851E4
.4byte BattleFrontier_BattleTowerElevator_MapEvents .4byte BattleFrontier_BattleTowerElevator_MapEvents
.4byte BattleFrontier_BattleTowerElevator_MapScripts .4byte BattleFrontier_BattleTowerElevator_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_BATTLE_TOWER .2byte MUS_SATTOWER
.2byte 266 .2byte 266
.byte 58 .byte 58
.byte 0 .byte 0
data/maps/BattleFrontier_BattleTowerLobby/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_BattleTowerLobby: @ 84851C8
.4byte BattleFrontier_BattleTowerLobby_MapEvents .4byte BattleFrontier_BattleTowerLobby_MapEvents
.4byte BattleFrontier_BattleTowerLobby_MapScripts .4byte BattleFrontier_BattleTowerLobby_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_BATTLE_TOWER .2byte MUS_SATTOWER
.2byte 264 .2byte 264
.byte 58 .byte 58
.byte 0 .byte 0
data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_BattleTowerMultiBattleRoom: @ 84852E0
.4byte BattleFrontier_BattleTowerMultiBattleRoom_MapEvents .4byte BattleFrontier_BattleTowerMultiBattleRoom_MapEvents
.4byte BattleFrontier_BattleTowerMultiBattleRoom_MapScripts .4byte BattleFrontier_BattleTowerMultiBattleRoom_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_BATTLE_TOWER .2byte MUS_SATTOWER
.2byte 390 .2byte 390
.byte 58 .byte 58
.byte 0 .byte 0
data/maps/BattleFrontier_Lounge1/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_Lounge1: @ 84855B8
.4byte BattleFrontier_Lounge1_MapEvents .4byte BattleFrontier_Lounge1_MapEvents
.4byte BattleFrontier_Lounge1_MapScripts .4byte BattleFrontier_Lounge1_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_B_TOWER .2byte MUS_B_TOWER
.2byte 429 .2byte 429
.byte 58 .byte 58
.byte 0 .byte 0
data/maps/BattleFrontier_Lounge2/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_Lounge2: @ 84855F0
.4byte BattleFrontier_Lounge2_MapEvents .4byte BattleFrontier_Lounge2_MapEvents
.4byte BattleFrontier_Lounge2_MapScripts .4byte BattleFrontier_Lounge2_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_B_TOWER .2byte MUS_B_TOWER
.2byte 397 .2byte 397
.byte 58 .byte 58
.byte 0 .byte 0
data/maps/BattleFrontier_Lounge3/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_Lounge3: @ 848560C
.4byte BattleFrontier_Lounge3_MapEvents .4byte BattleFrontier_Lounge3_MapEvents
.4byte BattleFrontier_Lounge3_MapScripts .4byte BattleFrontier_Lounge3_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_B_TOWER .2byte MUS_B_TOWER
.2byte 429 .2byte 429
.byte 58 .byte 58
.byte 0 .byte 0
data/maps/BattleFrontier_Lounge4/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_Lounge4: @ 8485628
.4byte BattleFrontier_Lounge4_MapEvents .4byte BattleFrontier_Lounge4_MapEvents
.4byte BattleFrontier_Lounge4_MapScripts .4byte BattleFrontier_Lounge4_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_B_TOWER .2byte MUS_B_TOWER
.2byte 429 .2byte 429
.byte 58 .byte 58
.byte 0 .byte 0
data/maps/BattleFrontier_Lounge5/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_Lounge5: @ 8485660
.4byte BattleFrontier_Lounge5_MapEvents .4byte BattleFrontier_Lounge5_MapEvents
.4byte BattleFrontier_Lounge5_MapScripts .4byte BattleFrontier_Lounge5_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_B_TOWER .2byte MUS_B_TOWER
.2byte 397 .2byte 397
.byte 58 .byte 58
.byte 0 .byte 0
data/maps/BattleFrontier_Lounge6/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_Lounge6: @ 848567C
.4byte BattleFrontier_Lounge6_MapEvents .4byte BattleFrontier_Lounge6_MapEvents
.4byte BattleFrontier_Lounge6_MapScripts .4byte BattleFrontier_Lounge6_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_B_TOWER .2byte MUS_B_TOWER
.2byte 429 .2byte 429
.byte 58 .byte 58
.byte 0 .byte 0
data/maps/BattleFrontier_Lounge7/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_Lounge7: @ 8485698
.4byte BattleFrontier_Lounge7_MapEvents .4byte BattleFrontier_Lounge7_MapEvents
.4byte BattleFrontier_Lounge7_MapScripts .4byte BattleFrontier_Lounge7_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_B_TOWER .2byte MUS_B_TOWER
.2byte 429 .2byte 429
.byte 58 .byte 58
.byte 0 .byte 0
data/maps/BattleFrontier_Lounge8/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_Lounge8: @ 84856D0
.4byte BattleFrontier_Lounge8_MapEvents .4byte BattleFrontier_Lounge8_MapEvents
.4byte BattleFrontier_Lounge8_MapScripts .4byte BattleFrontier_Lounge8_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_B_TOWER .2byte MUS_B_TOWER
.2byte 429 .2byte 429
.byte 58 .byte 58
.byte 0 .byte 0
data/maps/BattleFrontier_Lounge9/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_Lounge9: @ 84856EC
.4byte BattleFrontier_Lounge9_MapEvents .4byte BattleFrontier_Lounge9_MapEvents
.4byte BattleFrontier_Lounge9_MapScripts .4byte BattleFrontier_Lounge9_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_B_TOWER .2byte MUS_B_TOWER
.2byte 429 .2byte 429
.byte 58 .byte 58
.byte 0 .byte 0
data/maps/BattleFrontier_Mart/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_Mart: @ 8485740
.4byte BattleFrontier_Mart_MapEvents .4byte BattleFrontier_Mart_MapEvents
.4byte BattleFrontier_Mart_MapScripts .4byte BattleFrontier_Mart_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_FRIENDLY .2byte MUS_FRIENDLY
.2byte 63 .2byte 63
.byte 58 .byte 58
.byte 0 .byte 0
data/maps/BattleFrontier_OutsideEast/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_OutsideEast: @ 84852C4
.4byte BattleFrontier_OutsideEast_MapEvents .4byte BattleFrontier_OutsideEast_MapEvents
.4byte BattleFrontier_OutsideEast_MapScripts .4byte BattleFrontier_OutsideEast_MapScripts
.4byte BattleFrontier_OutsideEast_MapConnections .4byte BattleFrontier_OutsideEast_MapConnections
.2byte BGM_BATTLE_FRONTIER .2byte MUS_B_FRONTIER
.2byte 345 .2byte 345
.byte 58 .byte 58
.byte 0 .byte 0
data/maps/BattleFrontier_OutsideWest/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_OutsideWest: @ 84851AC
.4byte BattleFrontier_OutsideWest_MapEvents .4byte BattleFrontier_OutsideWest_MapEvents
.4byte BattleFrontier_OutsideWest_MapScripts .4byte BattleFrontier_OutsideWest_MapScripts
.4byte BattleFrontier_OutsideWest_MapConnections .4byte BattleFrontier_OutsideWest_MapConnections
.2byte BGM_BATTLE_FRONTIER .2byte MUS_B_FRONTIER
.2byte 265 .2byte 265
.byte 58 .byte 58
.byte 0 .byte 0
data/maps/BattleFrontier_PokemonCenter_1F/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_PokemonCenter_1F: @ 8485708
.4byte BattleFrontier_PokemonCenter_1F_MapEvents .4byte BattleFrontier_PokemonCenter_1F_MapEvents
.4byte BattleFrontier_PokemonCenter_1F_MapScripts .4byte BattleFrontier_PokemonCenter_1F_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_POKECEN .2byte MUS_POKECEN
.2byte 61 .2byte 61
.byte 58 .byte 58
.byte 0 .byte 0
data/maps/BattleFrontier_PokemonCenter_2F/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_PokemonCenter_2F: @ 8485724
.4byte BattleFrontier_PokemonCenter_2F_MapEvents .4byte BattleFrontier_PokemonCenter_2F_MapEvents
.4byte BattleFrontier_PokemonCenter_2F_MapScripts .4byte BattleFrontier_PokemonCenter_2F_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_POKECEN .2byte MUS_POKECEN
.2byte 62 .2byte 62
.byte 58 .byte 58
.byte 0 .byte 0
data/maps/BattleFrontier_RankingHall/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_RankingHall: @ 848559C
.4byte BattleFrontier_RankingHall_MapEvents .4byte BattleFrontier_RankingHall_MapEvents
.4byte BattleFrontier_RankingHall_MapScripts .4byte BattleFrontier_RankingHall_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_BIJYUTU .2byte MUS_BIJYUTU
.2byte 396 .2byte 396
.byte 58 .byte 58
.byte 0 .byte 0
data/maps/BattleFrontier_ReceptionGate/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_ReceptionGate: @ 84856B4
.4byte BattleFrontier_ReceptionGate_MapEvents .4byte BattleFrontier_ReceptionGate_MapEvents
.4byte BattleFrontier_ReceptionGate_MapScripts .4byte BattleFrontier_ReceptionGate_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_B_TOWER .2byte MUS_B_TOWER
.2byte 399 .2byte 399
.byte 58 .byte 58
.byte 0 .byte 0
data/maps/BattleFrontier_ScottsHouse/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_ScottsHouse: @ 8485644
.4byte BattleFrontier_ScottsHouse_MapEvents .4byte BattleFrontier_ScottsHouse_MapEvents
.4byte BattleFrontier_ScottsHouse_MapScripts .4byte BattleFrontier_ScottsHouse_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_B_TOWER .2byte MUS_B_TOWER
.2byte 430 .2byte 430
.byte 58 .byte 58
.byte 0 .byte 0
data/maps/CaveOfOrigin_1F/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ CaveOfOrigin_1F: @ 84842E8
.4byte CaveOfOrigin_1F_MapEvents .4byte CaveOfOrigin_1F_MapEvents
.4byte CaveOfOrigin_1F_MapScripts .4byte CaveOfOrigin_1F_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_DAN03 .2byte MUS_DAN03
.2byte 158 .2byte 158
.byte 72 .byte 72
.byte 0 .byte 0
data/maps/CaveOfOrigin_Entrance/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ CaveOfOrigin_Entrance: @ 84842CC
.4byte CaveOfOrigin_Entrance_MapEvents .4byte CaveOfOrigin_Entrance_MapEvents
.4byte CaveOfOrigin_Entrance_MapScripts .4byte CaveOfOrigin_Entrance_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_DAN03 .2byte MUS_DAN03
.2byte 157 .2byte 157
.byte 72 .byte 72
.byte 0 .byte 0
data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc
+1 -1
View File
@@ -3,7 +3,7 @@ CaveOfOrigin_UnusedRubySapphireMap1: @ 8484304
.4byte CaveOfOrigin_UnusedRubySapphireMap1_MapEvents .4byte CaveOfOrigin_UnusedRubySapphireMap1_MapEvents
.4byte CaveOfOrigin_UnusedRubySapphireMap1_MapScripts .4byte CaveOfOrigin_UnusedRubySapphireMap1_MapScripts
.4byte 0x0 .4byte 0x0
.2byte BGM_DAN03 .2byte MUS_DAN03
.2byte 159 .2byte 159
.byte 72 .byte 72
.byte 1 .byte 1

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