diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-11-10 02:24:21 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-11-10 02:52:05 -0600 |
| commit | de8a05871462eca6474d3961cf3fe855cd402fd4 (patch) | |
| tree | afb476072f86758e127a866677babfe0bbaaa609 | |
| parent | 29079c4b990076e0a9d3a299064262c8d522a4c5 (diff) | |
Extract more baseroms from maps
47 files changed, 552 insertions, 192 deletions
diff --git a/asm/battle_frontier_2.s b/asm/battle_frontier_2.s index b3dd9b522..0dd4d6a26 100755 --- a/asm/battle_frontier_2.s +++ b/asm/battle_frontier_2.s @@ -29815,7 +29815,7 @@ _081A9F7A: thumb_func_start sub_81A9F80 sub_81A9F80: @ 81A9F80 push {lr} - ldr r0, =gUnknown_08252C88 + ldr r0, =BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88 bl ScriptContext1_SetupScript pop {r0} bx r0 @@ -30241,8 +30241,8 @@ sub_81AA2F8: @ 81AA2F8 push {r4,r5,lr} ldr r0, =gSaveBlock1Ptr ldr r0, [r0] - ldr r5, =gUnknown_08252C4F - ldr r4, =gUnknown_08252C6A + ldr r5, =BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F + ldr r4, =BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A movs r2, 0xC8 lsls r2, 4 adds r1, r0, r2 diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index 2247c80c0..dc11f1506 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -836,7 +836,7 @@ _0809C574: lsrs r0, 24 cmp r0, 0x1 bne _0809C58C - ldr r0, =gUnknown_081E615D + ldr r0, =SootopolisCity_EventScript_1E615D b _0809C7E4 .pool _0809C58C: @@ -846,7 +846,7 @@ _0809C58C: lsrs r0, 24 cmp r0, 0x1 bne _0809C5A4 - ldr r0, =gUnknown_082393F9 + ldr r0, =SkyPillar_Outside_EventScript_2393F9 b _0809C7E4 .pool _0809C5A4: @@ -874,7 +874,7 @@ _0809C5CC: lsrs r0, 24 cmp r0, 0x1 bne _0809C5E4 - ldr r0, =gUnknown_0826A22A + ldr r0, =Route110_TrickHouseEntrance_EventScript_26A22A b _0809C7E4 .pool _0809C5E4: @@ -1310,7 +1310,7 @@ _0809C988: lsls r0, 24 cmp r0, 0 beq _0809C9A4 - ldr r0, =gUnknown_08252BE8 + ldr r0, =BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8 _0809C996: bl ScriptContext1_SetupScript movs r0, 0x1 @@ -1416,7 +1416,7 @@ _0809CA7C: lsrs r0, 24 cmp r0, 0x1 bne _0809CA94 - ldr r0, =gUnknown_08238EAF + ldr r0, =IslandCave_EventScript_238EAF bl ScriptContext1_SetupScript b _0809CB28 .pool @@ -1424,7 +1424,7 @@ _0809CA94: bl is_tile_that_overrides_player_control cmp r0, 0x1 bne _0809CAA8 - ldr r0, =gUnknown_081DF7BA + ldr r0, =MauvilleCity_EventScript_1DF7BA bl ScriptContext1_SetupScript b _0809CB28 .pool @@ -1432,7 +1432,7 @@ _0809CAA8: bl sub_8138120 cmp r0, 0x1 bne _0809CABC - ldr r0, =gUnknown_081F49EC + ldr r0, =Route119_EventScript_1F49EC bl ScriptContext1_SetupScript b _0809CB28 .pool @@ -1440,7 +1440,7 @@ _0809CABC: bl sub_8138168 cmp r0, 0x1 bne _0809CAD0 - ldr r0, =gUnknown_081FA4D6 + ldr r0, =LittlerootTown_ProfessorBirchsLab_EventScript_1FA4D6 bl ScriptContext1_SetupScript b _0809CB28 .pool @@ -1448,7 +1448,7 @@ _0809CAD0: bl sub_81381B0 cmp r0, 0x1 bne _0809CAE4 - ldr r0, =gUnknown_0821307B + ldr r0, =RustboroCity_Gym_EventScript_21307B bl ScriptContext1_SetupScript b _0809CB28 .pool diff --git a/asm/fldeff_cut.s b/asm/fldeff_cut.s index e31bf22e2..14502cb9a 100755 --- a/asm/fldeff_cut.s +++ b/asm/fldeff_cut.s @@ -1323,7 +1323,7 @@ _080D41D4: lsrs r0, 24 cmp r0, 0x1 bne _080D422A - ldr r0, =gUnknown_08267EDB + ldr r0, =FarawayIsland_Interior_EventScript_267EDB bl ScriptContext1_SetupScript _080D422A: pop {r4-r6} diff --git a/asm/item_use.s b/asm/item_use.s index d3c724166..c270d4c1e 100644 --- a/asm/item_use.s +++ b/asm/item_use.s @@ -1787,7 +1787,7 @@ sub_80FDE7C: @ 80FDE7C lsls r4, 24 lsrs r4, 24 bl ScriptContext2_Enable - ldr r0, =gUnknown_08242CFC + ldr r0, =BattleFrontier_OutsideEast_EventScript_242CFC bl ScriptContext1_SetupScript adds r0, r4, 0 bl DestroyTask diff --git a/asm/macros/movement.inc b/asm/macros/movement.inc index 6ca58c57e..5a810c497 100644 --- a/asm/macros/movement.inc +++ b/asm/macros/movement.inc @@ -114,6 +114,10 @@ create_movement step_94 create_movement step_95 create_movement step_96 + create_movement step_97 + create_movement step_98 + create_movement step_99 + create_movement step_9A enum_start 0xfe create_movement step_end diff --git a/asm/player_pc.s b/asm/player_pc.s index cd91ed3e1..592cc0fe0 100644 --- a/asm/player_pc.s +++ b/asm/player_pc.s @@ -379,12 +379,12 @@ sub_816B148: @ 816B148 ldrb r0, [r0, 0x8] cmp r0, 0 bne _0816B174 - ldr r0, =gUnknown_081F863F + ldr r0, =LittlerootTown_BrendansHouse_2F_EventScript_1F863F bl ScriptContext1_SetupScript b _0816B184 .pool _0816B174: - ldr r0, =gUnknown_081F958F + ldr r0, =LittlerootTown_MaysHouse_2F_EventScript_1F958F bl ScriptContext1_SetupScript b _0816B184 .pool diff --git a/asm/rom6.s b/asm/rom6.s index 83fbece49..38e249037 100644 --- a/asm/rom6.s +++ b/asm/rom6.s @@ -11777,7 +11777,7 @@ _0813B728: ldrh r0, [r0] cmp r0, 0x2 bne _0813B790 - ldr r0, =gUnknown_0824979B + ldr r0, =gText_YourPartnerHasRetired bl ShowFieldAutoScrollMessage b _0813B790 .pool @@ -11786,7 +11786,7 @@ _0813B74C: ldrh r0, [r0] cmp r0, 0x3 bne _0813B790 - ldr r0, =gUnknown_0824979B + ldr r0, =gText_YourPartnerHasRetired bl ShowFieldAutoScrollMessage b _0813B790 .pool diff --git a/asm/start_menu.s b/asm/start_menu.s index 752f2c810..dd12ea2dc 100644 --- a/asm/start_menu.s +++ b/asm/start_menu.s @@ -868,7 +868,7 @@ _0809FF00: bl sub_8197DF8 bl sub_80984F4 bl ScriptContext2_Disable - ldr r0, =gUnknown_08252C88 + ldr r0, =BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88 bl ScriptContext1_SetupScript movs r0, 0x1 b _0809FF22 @@ -1089,7 +1089,7 @@ sub_80A00A0: @ 80A00A0 lsls r0, 24 cmp r0, 0 beq _080A00D4 - ldr r0, =gUnknown_08252CA7 + ldr r0, =BattleFrontier_BattlePyramidEmptySquare_Text_252CA7 ldr r1, =sub_80A00EC bl sub_809FF98 b _080A00DC diff --git a/data/event_scripts.s b/data/event_scripts.s index 5ff59c001..f8a108a00 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -17757,7 +17757,7 @@ LilycoveCity_DepartmentStore_1F_Text_2A64B1: @ 82A64B1 LilycoveCity_DepartmentStore_1F_Text_2A64C8: @ 82A64C8 .string "Please pick a LOTO TICKET.\n" - .string "…{PAUSE 0x8}{PAUSE 0x8}{PAUSE 0x8}{PAUSE 0x8}…{PAUSE 0x8}{PAUSE 0x8}{PAUSE 0x8}{PAUSE 0x8}…{PAUSE 0x8}{PAUSE 0x8}{PAUSE 0x8}{PAUSE 0x8}$" + .string "…{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}…{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}…{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" LilycoveCity_DepartmentStore_1F_Text_2A650B: @ 82A650B .string "The LOTO TICKET number is {STR_VAR_1}.\p" diff --git a/data/maps/events/BattlePyramidSquare01.inc b/data/maps/events/BattlePyramidSquare01.inc index 76b17aa6e..f3c260243 100644 --- a/data/maps/events/BattlePyramidSquare01.inc +++ b/data/maps/events/BattlePyramidSquare01.inc @@ -1,11 +1,11 @@ BattlePyramidSquare01_MapObjects: @ 853A460 - object_event 1, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 2, 3, 4, 18, 17, 0, 1, 3, gUnknown_08252C4F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 0, 5, 3, 4, 17, 17, 0, 1, 3, gUnknown_08252C4F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BOY_4, 0, 0, 2, 6, 4, 16, 17, 0, 1, 5, gUnknown_08252C4F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BOY_2, 0, 0, 6, 6, 4, 9, 17, 0, 1, 4, gUnknown_08252C4F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 1, 4, 1, 17, 0, 0, 0, gUnknown_08252C6A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, 4, 1, 17, 0, 0, 0, gUnknown_08252C6A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 4, 4, 1, 17, 0, 0, 0, gUnknown_08252C6A, 0, 0, 0 + object_event 1, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 2, 3, 4, 18, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 0, 5, 3, 4, 17, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_BOY_4, 0, 0, 2, 6, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_BOY_2, 0, 0, 6, 6, 4, 9, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 1, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 4, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 BattlePyramidSquare01_MapEvents:: @ 853A508 map_events BattlePyramidSquare01_MapObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare02.inc b/data/maps/events/BattlePyramidSquare02.inc index e817ca72f..790fb67a0 100644 --- a/data/maps/events/BattlePyramidSquare02.inc +++ b/data/maps/events/BattlePyramidSquare02.inc @@ -1,11 +1,11 @@ BattlePyramidSquare02_MapObjects: @ 853A51C - object_event 1, MAP_OBJ_GFX_BOY_3, 0, 0, 2, 1, 4, 18, 17, 0, 1, 5, gUnknown_08252C4F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 5, 6, 4, 15, 17, 0, 1, 5, gUnknown_08252C4F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 0, 2, 6, 4, 16, 17, 0, 1, 5, gUnknown_08252C4F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 5, 1, 4, 17, 17, 0, 1, 5, gUnknown_08252C4F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 5, 4, 1, 17, 0, 0, 0, gUnknown_08252C6A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 0, 4, 1, 17, 0, 0, 0, gUnknown_08252C6A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 2, 4, 1, 17, 0, 0, 0, gUnknown_08252C6A, 0, 0, 0 + object_event 1, MAP_OBJ_GFX_BOY_3, 0, 0, 2, 1, 4, 18, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 5, 6, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 0, 2, 6, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 5, 1, 4, 17, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 5, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 BattlePyramidSquare02_MapEvents:: @ 853A5C4 map_events BattlePyramidSquare02_MapObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare03.inc b/data/maps/events/BattlePyramidSquare03.inc index a78402277..a8c8c59a7 100644 --- a/data/maps/events/BattlePyramidSquare03.inc +++ b/data/maps/events/BattlePyramidSquare03.inc @@ -1,11 +1,11 @@ BattlePyramidSquare03_MapObjects: @ 853A5D8 - object_event 1, MAP_OBJ_GFX_BOY_1, 0, 0, 2, 1, 4, 18, 17, 0, 1, 5, gUnknown_08252C4F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 6, 1, 4, 17, 17, 0, 1, 4, gUnknown_08252C4F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_FISHERMAN, 0, 0, 6, 4, 4, 15, 17, 0, 1, 3, gUnknown_08252C4F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MAN_4, 0, 0, 3, 4, 4, 18, 17, 0, 1, 4, gUnknown_08252C4F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 2, 4, 1, 17, 0, 0, 0, gUnknown_08252C6A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, gUnknown_08252C6A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 2, 7, 4, 1, 17, 0, 0, 0, gUnknown_08252C6A, 0, 0, 0 + object_event 1, MAP_OBJ_GFX_BOY_1, 0, 0, 2, 1, 4, 18, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 6, 1, 4, 17, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_FISHERMAN, 0, 0, 6, 4, 4, 15, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_MAN_4, 0, 0, 3, 4, 4, 18, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 2, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 BattlePyramidSquare03_MapEvents:: @ 853A680 map_events BattlePyramidSquare03_MapObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare04.inc b/data/maps/events/BattlePyramidSquare04.inc index 9b47d3d3b..ca836e2b5 100644 --- a/data/maps/events/BattlePyramidSquare04.inc +++ b/data/maps/events/BattlePyramidSquare04.inc @@ -1,11 +1,11 @@ BattlePyramidSquare04_MapObjects: @ 853A694 - object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 7, 2, 4, 17, 17, 0, 1, 5, gUnknown_08252C4F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GIRL_1, 0, 0, 7, 7, 4, 15, 17, 0, 1, 5, gUnknown_08252C4F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BOY_4, 0, 0, 1, 4, 4, 18, 17, 0, 1, 6, gUnknown_08252C4F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_GIRL_3, 0, 0, 6, 4, 4, 15, 17, 0, 1, 6, gUnknown_08252C4F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 2, 6, 4, 1, 17, 0, 0, 0, gUnknown_08252C6A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 3, 4, 1, 17, 0, 0, 0, gUnknown_08252C6A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 0, 4, 1, 17, 0, 0, 0, gUnknown_08252C6A, 0, 0, 0 + object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 7, 2, 4, 17, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_GIRL_1, 0, 0, 7, 7, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_BOY_4, 0, 0, 1, 4, 4, 18, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_GIRL_3, 0, 0, 6, 4, 4, 15, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 2, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 BattlePyramidSquare04_MapEvents:: @ 853A73C map_events BattlePyramidSquare04_MapObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare05.inc b/data/maps/events/BattlePyramidSquare05.inc index 15ba90ab0..0486f6283 100644 --- a/data/maps/events/BattlePyramidSquare05.inc +++ b/data/maps/events/BattlePyramidSquare05.inc @@ -1,11 +1,11 @@ BattlePyramidSquare05_MapObjects: @ 853A750 - object_event 1, MAP_OBJ_GFX_BOY_2, 0, 0, 6, 4, 4, 7, 17, 0, 1, 3, gUnknown_08252C4F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BOY_2, 0, 0, 3, 7, 4, 16, 17, 0, 1, 5, gUnknown_08252C4F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BOY_2, 0, 0, 3, 1, 4, 8, 17, 0, 1, 5, gUnknown_08252C4F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BOY_2, 0, 0, 6, 0, 4, 17, 17, 0, 1, 3, gUnknown_08252C4F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, gUnknown_08252C6A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 6, 4, 1, 17, 0, 0, 0, gUnknown_08252C6A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 3, 4, 1, 17, 0, 0, 0, gUnknown_08252C6A, 0, 0, 0 + object_event 1, MAP_OBJ_GFX_BOY_2, 0, 0, 6, 4, 4, 7, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_BOY_2, 0, 0, 3, 7, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_BOY_2, 0, 0, 3, 1, 4, 8, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_BOY_2, 0, 0, 6, 0, 4, 17, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 BattlePyramidSquare05_MapEvents:: @ 853A7F8 map_events BattlePyramidSquare05_MapObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare06.inc b/data/maps/events/BattlePyramidSquare06.inc index 12c8f8ffa..65d2f2576 100644 --- a/data/maps/events/BattlePyramidSquare06.inc +++ b/data/maps/events/BattlePyramidSquare06.inc @@ -1,11 +1,11 @@ BattlePyramidSquare06_MapObjects: @ 853A80C - object_event 1, MAP_OBJ_GFX_GIRL_2, 0, 0, 5, 2, 4, 17, 17, 0, 1, 3, gUnknown_08252C4F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GIRL_2, 0, 0, 2, 5, 4, 16, 17, 0, 1, 3, gUnknown_08252C4F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_GIRL_2, 0, 0, 5, 5, 4, 15, 17, 0, 1, 3, gUnknown_08252C4F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_GIRL_2, 0, 0, 2, 2, 4, 18, 17, 0, 1, 3, gUnknown_08252C4F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 7, 4, 1, 17, 0, 0, 0, gUnknown_08252C6A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 3, 4, 1, 17, 0, 0, 0, gUnknown_08252C6A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 0, 4, 1, 17, 0, 0, 0, gUnknown_08252C6A, 0, 0, 0 + object_event 1, MAP_OBJ_GFX_GIRL_2, 0, 0, 5, 2, 4, 17, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_GIRL_2, 0, 0, 2, 5, 4, 16, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_GIRL_2, 0, 0, 5, 5, 4, 15, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_GIRL_2, 0, 0, 2, 2, 4, 18, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 BattlePyramidSquare06_MapEvents:: @ 853A8B4 map_events BattlePyramidSquare06_MapObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare07.inc b/data/maps/events/BattlePyramidSquare07.inc index bf01ea2af..9a71e2a0b 100644 --- a/data/maps/events/BattlePyramidSquare07.inc +++ b/data/maps/events/BattlePyramidSquare07.inc @@ -1,11 +1,11 @@ BattlePyramidSquare07_MapObjects: @ 853A8C8 - object_event 1, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 0, 6, 4, 10, 17, 0, 1, 6, gUnknown_08252C4F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 4, 0, 4, 17, 17, 0, 1, 4, gUnknown_08252C4F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 6, 0, 4, 8, 17, 0, 1, 3, gUnknown_08252C4F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 4, 4, 4, 15, 17, 0, 1, 4, gUnknown_08252C4F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, 4, 1, 17, 0, 0, 0, gUnknown_08252C6A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 1, 4, 1, 17, 0, 0, 0, gUnknown_08252C6A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 7, 4, 1, 17, 0, 0, 0, gUnknown_08252C6A, 0, 0, 0 + object_event 1, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 0, 6, 4, 10, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 4, 0, 4, 17, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 6, 0, 4, 8, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 4, 4, 4, 15, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 1, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 BattlePyramidSquare07_MapEvents:: @ 853A970 map_events BattlePyramidSquare07_MapObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare08.inc b/data/maps/events/BattlePyramidSquare08.inc index 92c0dc50b..52a8d4911 100644 --- a/data/maps/events/BattlePyramidSquare08.inc +++ b/data/maps/events/BattlePyramidSquare08.inc @@ -1,11 +1,11 @@ BattlePyramidSquare08_MapObjects: @ 853A984 - object_event 1, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 1, 2, 4, 18, 17, 0, 1, 5, gUnknown_08252C4F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 6, 5, 4, 15, 17, 0, 1, 5, gUnknown_08252C4F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 1, 5, 4, 16, 17, 0, 1, 5, gUnknown_08252C4F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 6, 2, 4, 15, 17, 0, 1, 5, gUnknown_08252C4F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 3, 4, 1, 17, 0, 0, 0, gUnknown_08252C6A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 6, 4, 1, 17, 0, 0, 0, gUnknown_08252C6A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 0, 4, 1, 17, 0, 0, 0, gUnknown_08252C6A, 0, 0, 0 + object_event 1, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 1, 2, 4, 18, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 6, 5, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 1, 5, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 6, 2, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 BattlePyramidSquare08_MapEvents:: @ 853AA2C map_events BattlePyramidSquare08_MapObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare09.inc b/data/maps/events/BattlePyramidSquare09.inc index 47398568b..bc90aa649 100644 --- a/data/maps/events/BattlePyramidSquare09.inc +++ b/data/maps/events/BattlePyramidSquare09.inc @@ -1,11 +1,11 @@ BattlePyramidSquare09_MapObjects: @ 853AA40 - object_event 1, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 3, 0, 4, 8, 17, 0, 1, 5, gUnknown_08252C4F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 6, 4, 4, 15, 17, 0, 1, 4, gUnknown_08252C4F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 6, 0, 4, 17, 17, 0, 1, 4, gUnknown_08252C4F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 3, 5, 4, 15, 17, 0, 1, 5, gUnknown_08252C4F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 0, 4, 1, 17, 0, 0, 0, gUnknown_08252C6A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 0, 4, 1, 17, 0, 0, 0, gUnknown_08252C6A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 6, 4, 1, 17, 0, 0, 0, gUnknown_08252C6A, 0, 0, 0 + object_event 1, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 3, 0, 4, 8, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 6, 4, 4, 15, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 6, 0, 4, 17, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 3, 5, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 BattlePyramidSquare09_MapEvents:: @ 853AAE8 map_events BattlePyramidSquare09_MapObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare10.inc b/data/maps/events/BattlePyramidSquare10.inc index 5a0a169fe..013cd7be6 100644 --- a/data/maps/events/BattlePyramidSquare10.inc +++ b/data/maps/events/BattlePyramidSquare10.inc @@ -1,11 +1,11 @@ BattlePyramidSquare10_MapObjects: @ 853AAFC - object_event 1, MAP_OBJ_GFX_GIRL_3, 0, 0, 3, 0, 4, 17, 17, 0, 1, 3, gUnknown_08252C4F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 0, 0, 3, 4, 10, 17, 0, 1, 3, gUnknown_08252C4F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 0, 6, 5, 4, 9, 17, 0, 1, 6, gUnknown_08252C4F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_GIRL_3, 0, 0, 0, 5, 4, 10, 17, 0, 1, 7, gUnknown_08252C4F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 6, 4, 1, 17, 0, 0, 0, gUnknown_08252C6A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 3, 4, 1, 17, 0, 0, 0, gUnknown_08252C6A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 1, 4, 1, 17, 0, 0, 0, gUnknown_08252C6A, 0, 0, 0 + object_event 1, MAP_OBJ_GFX_GIRL_3, 0, 0, 3, 0, 4, 17, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 0, 0, 3, 4, 10, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 0, 6, 5, 4, 9, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_GIRL_3, 0, 0, 0, 5, 4, 10, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 1, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 BattlePyramidSquare10_MapEvents:: @ 853ABA4 map_events BattlePyramidSquare10_MapObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare11.inc b/data/maps/events/BattlePyramidSquare11.inc index 91b0d0297..96dc118e5 100644 --- a/data/maps/events/BattlePyramidSquare11.inc +++ b/data/maps/events/BattlePyramidSquare11.inc @@ -1,11 +1,11 @@ BattlePyramidSquare11_MapObjects: @ 853ABB8 - object_event 1, MAP_OBJ_GFX_BOY_4, 0, 0, 3, 2, 4, 8, 17, 0, 1, 5, gUnknown_08252C4F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BOY_4, 0, 0, 3, 6, 4, 14, 17, 0, 1, 4, gUnknown_08252C4F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BOY_4, 0, 0, 6, 4, 4, 8, 17, 0, 1, 3, gUnknown_08252C4F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BOY_4, 0, 0, 6, 7, 4, 7, 17, 0, 1, 3, gUnknown_08252C4F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 2, 4, 1, 17, 0, 0, 0, gUnknown_08252C6A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 2, 4, 1, 17, 0, 0, 0, gUnknown_08252C6A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 5, 4, 1, 17, 0, 0, 0, gUnknown_08252C6A, 0, 0, 0 + object_event 1, MAP_OBJ_GFX_BOY_4, 0, 0, 3, 2, 4, 8, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_BOY_4, 0, 0, 3, 6, 4, 14, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_BOY_4, 0, 0, 6, 4, 4, 8, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_BOY_4, 0, 0, 6, 7, 4, 7, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 5, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 BattlePyramidSquare11_MapEvents:: @ 853AC60 map_events BattlePyramidSquare11_MapObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare12.inc b/data/maps/events/BattlePyramidSquare12.inc index 056d012da..10b301d6c 100644 --- a/data/maps/events/BattlePyramidSquare12.inc +++ b/data/maps/events/BattlePyramidSquare12.inc @@ -1,11 +1,11 @@ BattlePyramidSquare12_MapObjects: @ 853AC74 - object_event 1, MAP_OBJ_GFX_WOMAN_1, 0, 0, 7, 5, 4, 9, 17, 0, 1, 7, gUnknown_08252C4F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_1, 0, 0, 0, 5, 4, 10, 17, 0, 1, 7, gUnknown_08252C4F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_1, 0, 0, 3, 0, 4, 8, 17, 0, 1, 6, gUnknown_08252C4F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_1, 0, 0, 3, 3, 4, 7, 17, 0, 1, 3, gUnknown_08252C4F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 2, 4, 1, 17, 0, 0, 0, gUnknown_08252C6A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, gUnknown_08252C6A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 7, 4, 1, 17, 0, 0, 0, gUnknown_08252C6A, 0, 0, 0 + object_event 1, MAP_OBJ_GFX_WOMAN_1, 0, 0, 7, 5, 4, 9, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_WOMAN_1, 0, 0, 0, 5, 4, 10, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_WOMAN_1, 0, 0, 3, 0, 4, 8, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_WOMAN_1, 0, 0, 3, 3, 4, 7, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 BattlePyramidSquare12_MapEvents:: @ 853AD1C map_events BattlePyramidSquare12_MapObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare13.inc b/data/maps/events/BattlePyramidSquare13.inc index 707f617c0..0a83a5441 100644 --- a/data/maps/events/BattlePyramidSquare13.inc +++ b/data/maps/events/BattlePyramidSquare13.inc @@ -1,11 +1,11 @@ BattlePyramidSquare13_MapObjects: @ 853AD30 - object_event 1, MAP_OBJ_GFX_FAT_MAN, 0, 0, 5, 1, 4, 8, 17, 0, 1, 6, gUnknown_08252C4F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_FAT_MAN, 0, 0, 5, 6, 4, 7, 17, 0, 1, 6, gUnknown_08252C4F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 0, 1, 1, 4, 8, 17, 0, 1, 6, gUnknown_08252C4F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_FAT_MAN, 0, 0, 1, 6, 4, 7, 17, 0, 1, 6, gUnknown_08252C4F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 1, 4, 1, 17, 0, 0, 0, gUnknown_08252C6A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 0, 4, 1, 17, 0, 0, 0, gUnknown_08252C6A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, gUnknown_08252C6A, 0, 0, 0 + object_event 1, MAP_OBJ_GFX_FAT_MAN, 0, 0, 5, 1, 4, 8, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_FAT_MAN, 0, 0, 5, 6, 4, 7, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 0, 1, 1, 4, 8, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_FAT_MAN, 0, 0, 1, 6, 4, 7, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 1, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 BattlePyramidSquare13_MapEvents:: @ 853ADD8 map_events BattlePyramidSquare13_MapObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare14.inc b/data/maps/events/BattlePyramidSquare14.inc index e03aa7791..599219cf1 100644 --- a/data/maps/events/BattlePyramidSquare14.inc +++ b/data/maps/events/BattlePyramidSquare14.inc @@ -1,11 +1,11 @@ BattlePyramidSquare14_MapObjects: @ 853ADEC - object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 0, 7, 1, 4, 17, 17, 0, 1, 7, gUnknown_08252C4F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 1, 1, 4, 18, 17, 0, 1, 6, gUnknown_08252C4F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 0, 6, 5, 4, 15, 17, 0, 1, 6, gUnknown_08252C4F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_2, 0, 0, 0, 5, 4, 16, 17, 0, 1, 7, gUnknown_08252C4F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 3, 4, 1, 17, 0, 0, 0, gUnknown_08252C6A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 4, 1, 17, 0, 0, 0, gUnknown_08252C6A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 5, 4, 1, 17, 0, 0, 0, gUnknown_08252C6A, 0, 0, 0 + object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 0, 7, 1, 4, 17, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 1, 1, 4, 18, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 0, 6, 5, 4, 15, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_WOMAN_2, 0, 0, 0, 5, 4, 16, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 5, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 BattlePyramidSquare14_MapEvents:: @ 853AE94 map_events BattlePyramidSquare14_MapObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare15.inc b/data/maps/events/BattlePyramidSquare15.inc index 78ca66840..ef92bec9a 100644 --- a/data/maps/events/BattlePyramidSquare15.inc +++ b/data/maps/events/BattlePyramidSquare15.inc @@ -1,11 +1,11 @@ BattlePyramidSquare15_MapObjects: @ 853AEA8 - object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 0, 2, 5, 4, 16, 17, 0, 1, 5, gUnknown_08252C4F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 2, 1, 4, 18, 17, 0, 1, 6, gUnknown_08252C4F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 0, 6, 4, 4, 15, 17, 0, 1, 4, gUnknown_08252C4F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_2, 0, 0, 6, 0, 4, 17, 17, 0, 1, 4, gUnknown_08252C4F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 4, 1, 17, 0, 0, 0, gUnknown_08252C6A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 5, 4, 1, 17, 0, 0, 0, gUnknown_08252C6A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 2, 4, 1, 17, 0, 0, 0, gUnknown_08252C6A, 0, 0, 0 + object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 0, 2, 5, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 2, 1, 4, 18, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 0, 6, 4, 4, 15, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_WOMAN_2, 0, 0, 6, 0, 4, 17, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 5, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 BattlePyramidSquare15_MapEvents:: @ 853AF50 map_events BattlePyramidSquare15_MapObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare16.inc b/data/maps/events/BattlePyramidSquare16.inc index 1ec5b9e34..1d7e44f70 100644 --- a/data/maps/events/BattlePyramidSquare16.inc +++ b/data/maps/events/BattlePyramidSquare16.inc @@ -1,11 +1,11 @@ BattlePyramidSquare16_MapObjects: @ 853AF64 - object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 0, 0, 6, 4, 16, 17, 0, 1, 6, gUnknown_08252C4F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 1, 0, 0, 18, 17, 0, 1, 6, gUnknown_08252C4F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 0, 6, 7, 4, 15, 17, 0, 1, 6, gUnknown_08252C4F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_2, 0, 0, 6, 0, 4, 17, 17, 0, 1, 6, gUnknown_08252C4F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 4, 1, 17, 0, 0, 0, gUnknown_08252C6A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 7, 4, 1, 17, 0, 0, 0, gUnknown_08252C6A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 2, 4, 1, 17, 0, 0, 0, gUnknown_08252C6A, 0, 0, 0 + object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 0, 0, 6, 4, 16, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 1, 0, 0, 18, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 0, 6, 7, 4, 15, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_WOMAN_2, 0, 0, 6, 0, 4, 17, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 BattlePyramidSquare16_MapEvents:: @ 853B00C map_events BattlePyramidSquare16_MapObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/scripts/BattleFrontier_BattleDomeBattleRoom.inc b/data/maps/scripts/BattleFrontier_BattleDomeBattleRoom.inc index 53ef4bb28..963e8e6c2 100644 --- a/data/maps/scripts/BattleFrontier_BattleDomeBattleRoom.inc +++ b/data/maps/scripts/BattleFrontier_BattleDomeBattleRoom.inc @@ -1251,7 +1251,15 @@ BattleFrontier_BattleDomeBattleRoom_Text_24D54D: @ 824D54D .string "I will very much look forward to\n" .string "our next encounter!$" - .incbin "baserom.gba", 0x24d5f5, 0x82 +BattleFrontier_BattleDomeBattleRoom_Text_24D5F5: @ 824D5F5 + .string "{PLAYER} is the Level 50\n" + .string "Battle Tournament Champion!\p" + .string "Congratulations!$" + +BattleFrontier_BattleDomeBattleRoom_Text_24D635: @ 824D635 + .string "{PLAYER} is the Open Level\n" + .string "Battle Tournament Champion!\p" + .string "Congratulations!$" BattleFrontier_BattleDomeBattleRoom_Text_24D677: @ 824D677 .string "The final match!\p" diff --git a/data/maps/scripts/BattleFrontier_BattleDomeLobby.inc b/data/maps/scripts/BattleFrontier_BattleDomeLobby.inc index 3ea84b58c..397793888 100644 --- a/data/maps/scripts/BattleFrontier_BattleDomeLobby.inc +++ b/data/maps/scripts/BattleFrontier_BattleDomeLobby.inc @@ -622,7 +622,10 @@ VerdanturfTown_BattleTentLobby_Text_24A554: @ 824A554 .string "{PLAYER} received the prize\n" .string "{STR_VAR_1}.$" - .incbin "baserom.gba", 0x24a56e, 0x51 +VerdanturfTown_BattleTentLobby_Text_24A56E: @ 824A56E + .string "Oh, your BAG appears to be full.\p" + .string "Please make room in your BAG, then come\n" + .string "see me.$" BattleFrontier_BattleDomeLobby_Text_24A5BF: @ 824A5BF .string "Thank you for playing!$" diff --git a/data/maps/scripts/BattleFrontier_BattlePalaceLobby.inc b/data/maps/scripts/BattleFrontier_BattlePalaceLobby.inc index 5ee3ffb5a..d62bc4412 100644 --- a/data/maps/scripts/BattleFrontier_BattlePalaceLobby.inc +++ b/data/maps/scripts/BattleFrontier_BattlePalaceLobby.inc @@ -569,7 +569,9 @@ VerdanturfTown_BattleTentLobby_Text_24E636: @ 824E636 .string "As a result, your challenge has been\n" .string "disqualified. It is most unfortunate.$" - .incbin "baserom.gba", 0x24e6c9, 0x1a +BattleFrontier_BattlePalaceLobby_Text_24E6C9: @ 824E6C9 + .string "{PLAYER} received the prize\n" + .string "{STR_VAR_1}.$" BattleFrontier_BattlePalaceLobby_Text_24E6E3: @ 824E6E3 .string "For a hardy fellow like me,\n" diff --git a/data/maps/scripts/BattleFrontier_BattlePyramidEmptySquare.inc b/data/maps/scripts/BattleFrontier_BattlePyramidEmptySquare.inc index f1ee2962a..640cff797 100644 --- a/data/maps/scripts/BattleFrontier_BattlePyramidEmptySquare.inc +++ b/data/maps/scripts/BattleFrontier_BattlePyramidEmptySquare.inc @@ -124,11 +124,36 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252BD5:: @ 8252BD5 special sub_81A8E7C return -gUnknown_08252BE8:: @ 8252BE8 - .incbin "baserom.gba", 0x252be8, 0x67 +BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8:: @ 8252BE8 + call BattleFrontier_BattlePalaceBattleRoom_EventScript_241EBA + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + special sub_81A1780 + addvar VAR_RESULT, 1 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 2 + copyvar VAR_0x8006, VAR_RESULT + special sub_81A1780 + compare_var_to_value VAR_RESULT, 7 + goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45 + setvar VAR_0x8004, 6 + special sub_81A8E7C + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 0 + special sub_81A1780 + setvar VAR_RESULT, 0 + warp BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE, 255, 1, 1 + waitstate + end + +BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45:: @ 8252C45 + warp BATTLE_FRONTIER_BATTLE_PYRAMID_TOP, 255, 17, 17 + waitstate + end -gUnknown_08252C4F:: @ 8252C4F - trainerbattle 9, TRAINER_PHILLIP, 0, BattlePyramidSquare01_Text_252C8D, BattlePyramidSquare01_Text_252C8D +BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F:: @ 8252C4F + trainerbattle 9, TRAINER_PHILLIP, 0, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D setvar VAR_0x8004, 10 special sub_81A8E7C waitmessage @@ -137,26 +162,28 @@ gUnknown_08252C4F:: @ 8252C4F releaseall end -gUnknown_08252C6A:: @ 8252C6A +BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A:: @ 8252C6A setvar VAR_0x8004, 7 special sub_81A8E7C callstd 1 compare_var_to_value VAR_0x8007, 0 - goto_eq BattlePyramidSquare01_EventScript_252C87 + goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C87 setvar VAR_0x8004, 8 special sub_81A8E7C -BattlePyramidSquare01_EventScript_252C87:: @ 8252C87 +BattleFrontier_BattlePyramidEmptySquare_EventScript_252C87:: @ 8252C87 end -gUnknown_08252C88:: @ 8252C88 - .incbin "baserom.gba", 0x252c88, 0x5 +BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88:: @ 8252C88 + goto BattleFrontier_BattlePyramidTop_EventScript_252B42 -BattlePyramidSquare01_Text_252C8D: @ 8252C8D +BattleFrontier_BattlePyramidEmptySquare_Text_252C8D: @ 8252C8D .string "This is a sample message.$" -gUnknown_08252CA7:: @ 8252CA7 - .incbin "baserom.gba", 0x252ca7, 0x54 +BattleFrontier_BattlePyramidEmptySquare_Text_252CA7:: @ 8252CA7 + .string "Your BATTLE PYRAMID quest will be\n" + .string "saved so that you may quit for now.\l" + .string "Is that okay?$" gUnknown_08252CFB:: @ 8252CFB .incbin "baserom.gba", 0x252cfb, 0x23a6 diff --git a/data/maps/scripts/BattleFrontier_BattleTowerBattleRoom2.inc b/data/maps/scripts/BattleFrontier_BattleTowerBattleRoom2.inc index c601d7419..2ea9c897b 100644 --- a/data/maps/scripts/BattleFrontier_BattleTowerBattleRoom2.inc +++ b/data/maps/scripts/BattleFrontier_BattleTowerBattleRoom2.inc @@ -534,5 +534,7 @@ BattleFrontier_BattleTowerBattleRoom2_Text_24975D: @ 824975D gText_LinkStandby3:: @ 824978D .string "Link standby…$" -gUnknown_0824979B:: @ 824979B - .incbin "baserom.gba", 0x24979b, 0x47 +gText_YourPartnerHasRetired:: @ 824979B + .string "Your partner has retired.\p" + .string "Your BATTLE ROOM challenge\n" + .string "will be canceled.$" diff --git a/data/maps/scripts/BattleFrontier_OutsideEast.inc b/data/maps/scripts/BattleFrontier_OutsideEast.inc index ebe208322..d1dc4d8e2 100644 --- a/data/maps/scripts/BattleFrontier_OutsideEast.inc +++ b/data/maps/scripts/BattleFrontier_OutsideEast.inc @@ -114,8 +114,41 @@ BattleFrontier_OutsideEast_EventScript_242CEA:: @ 8242CEA release end -gUnknown_08242CFC:: @ 8242CFC - .incbin "baserom.gba", 0x242cfc, 0x6d +BattleFrontier_OutsideEast_EventScript_242CFC:: @ 8242CFC + lock + faceplayer + special sub_80FAFF8 + waitstate + waitse + playse 269 + applymovement 14, BattleFrontier_OutsideEast_Movement_242D69 + waitmovement 0 + msgbox gUnknown_082731BD, 4 + closemessage + waitse + playmoncry SPECIES_SUDOWOODO, 2 + delay 40 + waitmoncry + setvar VAR_LAST_TALKED, 14 + setwildbattle SPECIES_SUDOWOODO, 40, ITEM_NONE + setflag FLAG_SYS_CTRL_OBJ_DELETE + dowildbattle + clearflag FLAG_SYS_CTRL_OBJ_DELETE + specialvar VAR_RESULT, sub_8138B80 + compare_var_to_value VAR_RESULT, 1 + goto_eq BattleFrontier_OutsideEast_EventScript_242D60 + compare_var_to_value VAR_RESULT, 4 + goto_eq BattleFrontier_OutsideEast_EventScript_242D60 + compare_var_to_value VAR_RESULT, 5 + goto_eq BattleFrontier_OutsideEast_EventScript_242D60 + setflag FLAG_0x1C6 + release + end + +BattleFrontier_OutsideEast_EventScript_242D60:: @ 8242D60 + setflag FLAG_0x1C6 + goto IslandCave_EventScript_27376D + end BattleFrontier_OutsideEast_Movement_242D69: @ 8242D69 step_03 diff --git a/data/maps/scripts/FarawayIsland_Interior.inc b/data/maps/scripts/FarawayIsland_Interior.inc index 4ce0d77ed..f49d938a7 100644 --- a/data/maps/scripts/FarawayIsland_Interior.inc +++ b/data/maps/scripts/FarawayIsland_Interior.inc @@ -192,5 +192,16 @@ FarawayIsland_Interior_EventScript_267ED0:: @ 8267ED0 waitmovement 0 return -gUnknown_08267EDB:: @ 8267EDB - .incbin "baserom.gba", 0x267edb, 0x3a +FarawayIsland_Interior_EventScript_267EDB:: @ 8267EDB + lockall + fadescreenswapbuffers 1 + setflag FLAG_0x2CE + removeobject 1 + fadescreenswapbuffers 0 + msgbox FarawayIsland_Interior_Text_267EF1, 4 + closemessage + releaseall + end + +FarawayIsland_Interior_Text_267EF1: @ 8267EF1 + .string "The feeling of being watched faded…$" diff --git a/data/maps/scripts/IslandCave.inc b/data/maps/scripts/IslandCave.inc index 8c79e2c94..69a3ef76a 100644 --- a/data/maps/scripts/IslandCave.inc +++ b/data/maps/scripts/IslandCave.inc @@ -41,8 +41,17 @@ IslandCave_EventScript_238EAB:: @ 8238EAB clearflag FLAG_0x3A8 return -gUnknown_08238EAF:: @ 8238EAF - .incbin "baserom.gba", 0x238eaf, 0x40 +IslandCave_EventScript_238EAF:: @ 8238EAF + setmetatile 7, 19, 554, 1 + setmetatile 8, 19, 555, 1 + setmetatile 9, 19, 556, 1 + setmetatile 7, 20, 562, 1 + setmetatile 8, 20, 563, 0 + setmetatile 9, 20, 564, 1 + special DrawWholeMapView + playse SE_BAN + setflag FLAG_SYS_BRAILLE_WAIT + end IslandCave_EventScript_238EEF:: @ 8238EEF lockall diff --git a/data/maps/scripts/LittlerootTown_BrendansHouse_1F.inc b/data/maps/scripts/LittlerootTown_BrendansHouse_1F.inc index 9594ae531..aa43cc5f2 100644 --- a/data/maps/scripts/LittlerootTown_BrendansHouse_1F.inc +++ b/data/maps/scripts/LittlerootTown_BrendansHouse_1F.inc @@ -386,7 +386,19 @@ LittlerootTown_BrendansHouse_1F_Text_1F7EC6: @ 81F7EC6 .string "INTERVIEWER: …We brought you this\n" .string "report from in front of PETALBURG GYM.$" - .incbin "baserom.gba", 0x1f7f0f, 0xff +LittlerootTown_BrendansHouse_1F_Text_1F7F0F: @ 81F7F0F + .string "There is a movie on TV.\p" + .string "Two men are dancing on a big piano\n" + .string "keyboard.\p" + .string "Better get going!$" + +LittlerootTown_BrendansHouse_1F_Text_1F7F66: @ 81F7F66 + .string "It’s the instruction booklet for the\n" + .string "RUNNING SHOES.\p" + .string "“Press the B Button to run while\n" + .string "wearing your RUNNING SHOES.\p" + .string "“Lace up your RUNNING SHOES and hit\n" + .string "the road running!”$" LittlerootTown_BrendansHouse_1F_Text_1F800E: @ 81F800E .string "DAD: Hm?\p" diff --git a/data/maps/scripts/LittlerootTown_BrendansHouse_2F.inc b/data/maps/scripts/LittlerootTown_BrendansHouse_2F.inc index 6acb77831..831c7f8ab 100644 --- a/data/maps/scripts/LittlerootTown_BrendansHouse_2F.inc +++ b/data/maps/scripts/LittlerootTown_BrendansHouse_2F.inc @@ -264,8 +264,12 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8626:: @ 81F8626 releaseall end -gUnknown_081F863F:: @ 81F863F - .incbin "baserom.gba", 0x1f863f, 0xd +LittlerootTown_BrendansHouse_2F_EventScript_1F863F:: @ 81F863F + setvar VAR_0x8004, 1 + playse SE_PC_OFF + special sub_8138E20 + releaseall + end LittlerootTown_BrendansHouse_2F_EventScript_1F864C:: @ 81F864C msgbox gUnknown_08272CD5, 4 @@ -304,7 +308,9 @@ LittlerootTown_BrendansHouse_2F_Text_1F877F: @ 81F877F .string "Record your progress with SAVE.\p" .string "The remaining pages are blank…$" - .incbin "baserom.gba", 0x1f8820, 0x2f +LittlerootTown_BrendansHouse_2F_Text_1F8820: @ 81F8820 + .string "{PLAYER} took a closer look at the\n" + .string "HOENN region map.$" LittlerootTown_BrendansHouse_2F_Text_1F884F: @ 81F884F .string "It’s a Nintendo GameCube.\p" diff --git a/data/maps/scripts/LittlerootTown_MaysHouse_2F.inc b/data/maps/scripts/LittlerootTown_MaysHouse_2F.inc index cbd1efcef..f7db4b4cd 100644 --- a/data/maps/scripts/LittlerootTown_MaysHouse_2F.inc +++ b/data/maps/scripts/LittlerootTown_MaysHouse_2F.inc @@ -325,9 +325,12 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9576:: @ 81F9576 releaseall end -gUnknown_081F958F:: @ 81F958F - - .incbin "baserom.gba", 0x1f958f, 0xd +LittlerootTown_MaysHouse_2F_EventScript_1F958F:: @ 81F958F + setvar VAR_0x8004, 2 + playse SE_PC_OFF + special sub_8138E20 + releaseall + end LittlerootTown_MaysHouse_2F_Text_1F959C: @ 81F959C .string "Huh?\n" diff --git a/data/maps/scripts/LittlerootTown_ProfessorBirchsLab.inc b/data/maps/scripts/LittlerootTown_ProfessorBirchsLab.inc index 59e8a1124..cef69c7b2 100644 --- a/data/maps/scripts/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/maps/scripts/LittlerootTown_ProfessorBirchsLab.inc @@ -687,8 +687,13 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD:: @ 81FA4CD msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB148, 3 end -gUnknown_081FA4D6:: @ 81FA4D6 - .incbin "baserom.gba", 0x1fa4d6, 0xc +LittlerootTown_ProfessorBirchsLab_EventScript_1FA4D6:: @ 81FA4D6 + lockall + pokenavcall LittlerootTown_ProfessorBirchsLab_Text_1FBD1A + waitmessage + clearflag FLAG_0x072 + releaseall + end LittlerootTown_ProfessorBirchsLab_Text_1FA4E2: @ 81FA4E2 .string "Hunh? PROF. BIRCH?\p" @@ -954,13 +959,17 @@ LittlerootTown_ProfessorBirchsLab_Text_1FB959: @ 81FB959 .string "you decide.\p" .string "They’re all invaluable POKéMON.$" - .incbin "baserom.gba", 0x1fb9a8, 0x2f +LittlerootTown_ProfessorBirchsLab_Text_1FB9A8: @ 81FB9A8 + .string "PROF. BIRCH: I see!\n" + .string "You picked a fine POKéMON!$" LittlerootTown_ProfessorBirchsLab_Text_1FB9D7: @ 81FB9D7 .string "{PLAYER} received the {STR_VAR_1}\n" .string "from PROF. BIRCH!$" - .incbin "baserom.gba", 0x1fb9fc, 0x30 +LittlerootTown_ProfessorBirchsLab_Text_1FB9FC: @ 81FB9FC + .string "Want to give a nickname to\n" + .string "the {STR_VAR_1} you received?$" LittlerootTown_ProfessorBirchsLab_Text_1FBA2C: @ 81FBA2C .string "PROF. BIRCH: Listen, {PLAYER}{KUN}.\n" @@ -975,7 +984,9 @@ LittlerootTown_ProfessorBirchsLab_Text_1FBAF8: @ 81FBAF8 .string "You received the promised POKéMON.\n" .string "Better leave the others alone.$" - .incbin "baserom.gba", 0x1fbb3a, 0x2e +LittlerootTown_ProfessorBirchsLab_Text_1FBB3A: @ 81FBB3A + .string "Oh, you don’t have any room for\n" + .string "this POKéMON.$" LittlerootTown_ProfessorBirchsLab_Text_1FBB68: @ 81FBB68 .string "MAY: {PLAYER}{KUN}, after this…\n" @@ -1001,4 +1012,19 @@ LittlerootTown_ProfessorBirchsLab_Text_1FBCD2: @ 81FBCD2 .string "Have you gone out to that place,\l" .string "the BATTLE FRONTIER?$" - .incbin "baserom.gba", 0x1fbd1a, 0x16b +LittlerootTown_ProfessorBirchsLab_Text_1FBD1A: @ 81FBD1A + .string "… … … … … …\n" + .string "… … … … … Beep!\p" + .string "SCOTT: Hi, hi, {PLAYER}!\n" + .string "It’s me, SCOTT.\p" + .string "I’m aboard the S.S. TIDAL now.\n" + .string "It feels great to be on the sea!\p" + .string "By the way…\p" + .string "There’s this place that I’d like to\n" + .string "invite you to for a visit.\p" + .string "If you’re interested, board a ferry\n" + .string "at either SLATEPORT or LILYCOVE.\p" + .string "I’ll fill you in on the details when\n" + .string "we meet. I’ll be waiting!\p" + .string "… … … … … …\n" + .string "… … … … … Click!$" diff --git a/data/maps/scripts/MauvilleCity.inc b/data/maps/scripts/MauvilleCity.inc index 64d9e574e..b470e4432 100644 --- a/data/maps/scripts/MauvilleCity.inc +++ b/data/maps/scripts/MauvilleCity.inc @@ -457,8 +457,20 @@ MauvilleCity_EventScript_1DF7B0:: @ 81DF7B0 release end -gUnknown_081DF7BA:: @ 81DF7BA - .incbin "baserom.gba", 0x1df7ba, 0x22 +MauvilleCity_EventScript_1DF7BA:: @ 81DF7BA + lockall + pokenavcall MauvilleCity_Text_1DFDFB + waitmessage + delay 30 + playfanfare BGM_ME_MATCH_CALL + msgbox MauvilleCity_Text_1DFEB4, 4 + waitfanfare + closemessage + delay 30 + setflag FLAG_0x0D6 + clearflag FLAG_0x088 + releaseall + end MauvilleCity_Text_1DF7DC: @ 81DF7DC .string "UNCLE: It’s because of POKéMON that\n" @@ -545,7 +557,21 @@ MauvilleCity_Text_1DFD34: @ 81DFD34 .string "sometime?\l" .string "I’m sure WALLY would enjoy it.$" - .incbin "baserom.gba", 0x1dfdfb, 0xda + +MauvilleCity_Text_1DFDFB: @ 81DFDFB + .string "… … … … … …\n" + .string "… … … … … Beep!\p" + .string "WALLY: Oh, hello, {PLAYER}!\p" + .string "I just wanted to tell you that\n" + .string "my uncle bought me a POKéNAV!\p" + .string "Now I can get in touch with you\n" + .string "anytime, {PLAYER}!\p" + .string "… … … … … …\n" + .string "… … … … … Click!$" + +MauvilleCity_Text_1DFEB4: @ 81DFEB4 + .string "Registered WALLY\n" + .string "in the POKéNAV.$" MauvilleCity_Text_1DFED5: @ 81DFED5 .string "SCOTT: Hehe…\n" diff --git a/data/maps/scripts/PetalburgCity.inc b/data/maps/scripts/PetalburgCity.inc index a82ac3aba..e223bf414 100644 --- a/data/maps/scripts/PetalburgCity.inc +++ b/data/maps/scripts/PetalburgCity.inc @@ -346,7 +346,11 @@ PetalburgCity_EventScript_1DC5FF:: @ 81DC5FF waitmovement 0 return - .incbin "baserom.gba", 0x1dc611, 0x4 +PetalburgCity_Movement_1DC611:: @ 81DC611 + step_14 + step_14 + step_14 + step_end PetalburgCity_Movement_1DC615: @ 81DC615 step_right diff --git a/data/maps/scripts/Route110_TrickHouseEntrance.inc b/data/maps/scripts/Route110_TrickHouseEntrance.inc index ec12ea31b..b7b9453e3 100644 --- a/data/maps/scripts/Route110_TrickHouseEntrance.inc +++ b/data/maps/scripts/Route110_TrickHouseEntrance.inc @@ -597,9 +597,111 @@ Route110_TrickHouseEntrance_EventScript_26A220:: @ 826A220 releaseall end -gUnknown_0826A22A:: @ 826A22A +Route110_TrickHouseEntrance_EventScript_26A22A:: @ 826A22A + lockall + switch VAR_0x4044 + case 0, Route110_TrickHouseEntrance_EventScript_26A289 + case 1, Route110_TrickHouseEntrance_EventScript_26A2B2 + case 2, Route110_TrickHouseEntrance_EventScript_26A2DB + case 3, Route110_TrickHouseEntrance_EventScript_26A304 + case 4, Route110_TrickHouseEntrance_EventScript_26A32D + case 5, Route110_TrickHouseEntrance_EventScript_26A356 + case 6, Route110_TrickHouseEntrance_EventScript_26A37F + case 7, Route110_TrickHouseEntrance_EventScript_26A3A8 + end + +Route110_TrickHouseEntrance_EventScript_26A289:: @ 826A289 + compare_var_to_value VAR_0x40AB, 0 + goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 + msgbox Route110_TrickHousePuzzle1_Text_26B98D, 4 + playse SE_PIN + setvar VAR_0x40AB, 2 + setmetatile 13, 1, 523, 0 + special DrawWholeMapView + releaseall + end + +Route110_TrickHouseEntrance_EventScript_26A2B2:: @ 826A2B2 + compare_var_to_value VAR_0x40AC, 0 + goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 + msgbox Route110_TrickHousePuzzle2_Text_26BCBA, 4 + playse SE_PIN + setvar VAR_0x40AC, 2 + setmetatile 13, 1, 523, 0 + special DrawWholeMapView + releaseall + end - .incbin "baserom.gba", 0x26a22a, 0x1b1 +Route110_TrickHouseEntrance_EventScript_26A2DB:: @ 826A2DB + compare_var_to_value VAR_0x40AD, 0 + goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 + msgbox Route110_TrickHousePuzzle3_Text_26C609, 4 + playse SE_PIN + setvar VAR_0x40AD, 2 + setmetatile 13, 1, 523, 0 + special DrawWholeMapView + releaseall + end + +Route110_TrickHouseEntrance_EventScript_26A304:: @ 826A304 + compare_var_to_value VAR_0x40AE, 0 + goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 + msgbox Route110_TrickHousePuzzle4_Text_26C8C3, 4 + playse SE_PIN + setvar VAR_0x40AE, 2 + setmetatile 13, 1, 523, 0 + special DrawWholeMapView + releaseall + end + +Route110_TrickHouseEntrance_EventScript_26A32D:: @ 826A32D + compare_var_to_value VAR_0x40AF, 0 + goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 + msgbox Route110_TrickHousePuzzle5_Text_26D660, 4 + playse SE_PIN + setvar VAR_0x40AF, 2 + setmetatile 13, 1, 523, 0 + special DrawWholeMapView + releaseall + end + +Route110_TrickHouseEntrance_EventScript_26A356:: @ 826A356 + compare_var_to_value VAR_0x40B0, 0 + goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 + msgbox Route110_TrickHousePuzzle6_Text_26DE26, 4 + playse SE_PIN + setvar VAR_0x40B0, 2 + setmetatile 13, 1, 523, 0 + special DrawWholeMapView + releaseall + end + +Route110_TrickHouseEntrance_EventScript_26A37F:: @ 826A37F + compare_var_to_value VAR_0x40B1, 0 + goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 + msgbox Route110_TrickHousePuzzle7_EventScript_26E413, 4 + playse SE_PIN + setvar VAR_0x40B1, 2 + setmetatile 13, 1, 523, 0 + special DrawWholeMapView + releaseall + end + +Route110_TrickHouseEntrance_EventScript_26A3A8:: @ 826A3A8 + compare_var_to_value VAR_0x40B2, 0 + goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 + msgbox Route110_TrickHousePuzzle8_EventScript_26E864, 4 + playse SE_PIN + setvar VAR_0x40B2, 2 + setmetatile 13, 1, 523, 0 + special DrawWholeMapView + releaseall + end + +Route110_TrickHouseEntrance_EventScript_26A3D1:: @ 826A3D1 + msgbox Route110_TrickHouseEntrance_Text_26AC4F, 4 + releaseall + end Route110_TrickHousePuzzle1_EventScript_26A3DB:: @ 826A3DB Route110_TrickHousePuzzle2_EventScript_26A3DB:: @ 826A3DB @@ -793,4 +895,7 @@ Route110_TrickHousePuzzle1_Text_26ABFB: @ 826ABFB Route110_TrickHousePuzzle1_Text_26AC2F: @ 826AC2F .string "A secret code is written on it.$" - .incbin "baserom.gba", 0x26ac4f, 0x60 +Route110_TrickHouseEntrance_Text_26AC4F: @ 826AC4F + .string "The door is locked.\p" + .string "…On closer inspection, this is written\n" + .string "on it: “Write the secret code here.”$" diff --git a/data/maps/scripts/Route110_TrickHousePuzzle5.inc b/data/maps/scripts/Route110_TrickHousePuzzle5.inc index 03aa852e9..5f90e7f1d 100644 --- a/data/maps/scripts/Route110_TrickHousePuzzle5.inc +++ b/data/maps/scripts/Route110_TrickHousePuzzle5.inc @@ -964,7 +964,12 @@ Route110_TrickHousePuzzle5_Movement_26D632: @ 826D632 step_00 step_end - .incbin "baserom.gba", 0x26d660, 0x6e +Route110_TrickHousePuzzle5_Text_26D660: @ 826D660 + .string "{PLAYER} wrote down the secret code\n" + .string "on the door.\p" + .string "“TRICK MASTER is a genius.”\n" + .string "… … … … … … … …\p" + .string "The lock clicked open!$" Route110_TrickHousePuzzle5_Text_26D6CE: @ 826D6CE .string "CLICKETY-CLACK…\n" diff --git a/data/maps/scripts/Route119.inc b/data/maps/scripts/Route119.inc index 9a3e99b93..4436005ba 100644 --- a/data/maps/scripts/Route119.inc +++ b/data/maps/scripts/Route119.inc @@ -493,8 +493,14 @@ Route119_EventScript_1F49E3:: @ 81F49E3 msgbox Route119_Text_1F5339, 3 end -gUnknown_081F49EC:: @ 81F49EC - .incbin "baserom.gba", 0x1f49ec, 0x11 +Route119_EventScript_1F49EC:: @ 81F49EC + lockall + pokenavcall Route119_Text_1F4FBA + waitmessage + clearflag FLAG_0x08A + addvar VAR_0x40D1, 1 + releaseall + end Route119_Text_1F49FD: @ 81F49FD .string "MAY: {PLAYER}{KUN}!\n" @@ -568,7 +574,21 @@ Route119_Text_1F4E60: @ 81F4E60 .string "I expect that you’ll do well at the GYM.\n" .string "Well, I’ll be seeing you!$" - .incbin "baserom.gba", 0x1f4fba, 0x131 + +Route119_Text_1F4FBA: @ 81F4FBA + .string "… … … … … …\n" + .string "… … … … … Beep!\p" + .string "SCOTT: Hiya, {PLAYER}{KUN}, it’s me!\p" + .string "Just as I thought, you won at\n" + .string "the FORTREE GYM.\p" + .string "Your strength…\n" + .string "Perhaps you really are the TRAINER\l" + .string "that I’ve been searching for.\p" + .string "Remember, you have a fan in me.\n" + .string "I’ll be cheering from the sidelines.\l" + .string "Keep up the great work!\p" + .string "… … … … … …\n" + .string "… … … … … Click!$" Route119_Text_1F50EB: @ 81F50EB .string "We’re standing lookout here.\p" diff --git a/data/maps/scripts/RustboroCity_Gym.inc b/data/maps/scripts/RustboroCity_Gym.inc index 43140d7d9..dec6a8e73 100644 --- a/data/maps/scripts/RustboroCity_Gym.inc +++ b/data/maps/scripts/RustboroCity_Gym.inc @@ -95,8 +95,20 @@ RustboroCity_Gym_EventScript_213071:: @ 8213071 releaseall end -gUnknown_0821307B:: @ 821307B - .incbin "baserom.gba", 0x21307b, 0x22 +RustboroCity_Gym_EventScript_21307B:: @ 821307B + lockall + pokenavcall RustboroCity_Gym_Text_213A76 + waitmessage + delay 30 + playfanfare BGM_ME_MATCH_CALL + msgbox RustboroCity_Gym_Text_213C01, 4 + waitfanfare + closemessage + delay 30 + setflag FLAG_0x1D3 + clearflag FLAG_0x080 + releaseall + end RustboroCity_Gym_Text_21309D: @ 821309D .string "Yo, how’s it going?\p" @@ -226,7 +238,27 @@ RustboroCity_Gym_Text_213A3B: @ 8213A3B .string "ROXANNE’S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" - .incbin "baserom.gba", 0x213a76, 0x1b9 + +RustboroCity_Gym_Text_213A76: @ 8213A76 + .string "… … … … … …\n" + .string "… … … … … Beep!\p" + .string "ROXANNE: Oh, hello, {PLAYER}?\n" + .string "This is ROXANNE of RUSTBORO CITY.\p" + .string "I heard from BRAWLY that you’re\n" + .string "moving up through the ranks of\l" + .string "TRAINERS at an incredible clip.\p" + .string "Well, I’d rather not think that\n" + .string "I can’t beat you.\p" + .string "I promise, I will shape up my GYM\n" + .string "so that you may challenge us again.\p" + .string "I hope you’ll be looking forward to\n" + .string "that occasion as much as me!\p" + .string "… … … … … …\n" + .string "… … … … … Click!$" + +RustboroCity_Gym_Text_213C01: @ 8213C01 + .string "Registered GYM LEADER ROXANNE\n" + .string "in the POKéNAV.$" RustboroCity_Gym_Text_213C2F: @ 8213C2F .string "ROXANNE: I’m so glad to see you again.\n" diff --git a/data/maps/scripts/SkyPillar_Outside.inc b/data/maps/scripts/SkyPillar_Outside.inc index 5e8812f46..c2f211ab8 100644 --- a/data/maps/scripts/SkyPillar_Outside.inc +++ b/data/maps/scripts/SkyPillar_Outside.inc @@ -137,8 +137,12 @@ SkyPillar_Outside_Movement_2393EB: @ 82393EB SkyPillar_Outside_EventScript_2393F8:: @ 82393F8 end -gUnknown_082393F9:: @ 82393F9 - .incbin "baserom.gba", 0x2393f9, 0x1d +SkyPillar_Outside_EventScript_2393F9:: @ 82393F9 + msgbox SkyPillar_Outside_Text_239402, 3 + end + +SkyPillar_Outside_Text_239402: @ 8239402 + .string "The door is closed.$" SkyPillar_Outside_Text_239416: @ 8239416 .string "WALLACE: Oh, my, I’m terribly sorry!\p" diff --git a/data/maps/scripts/SootopolisCity.inc b/data/maps/scripts/SootopolisCity.inc index 02b0c56be..33b65714b 100644 --- a/data/maps/scripts/SootopolisCity.inc +++ b/data/maps/scripts/SootopolisCity.inc @@ -927,8 +927,9 @@ SootopolisCity_EventScript_1E6154:: @ 81E6154 msgbox SootopolisCity_Text_1E65C8, 3 end -gUnknown_081E615D:: @ 81E615D - .incbin "baserom.gba", 0x1e615d, 0x9 +SootopolisCity_EventScript_1E615D:: @ 81E615D + msgbox SootopolisCity_Text_1E6604, 3 + end SootopolisCity_EventScript_1E6166:: @ 81E6166 lockall @@ -1452,7 +1453,13 @@ SootopolisCity_EventScript_1E654C:: @ 81E654C releaseall end - .incbin "baserom.gba", 0x1e656b, 0x4 +SootopolisCity_Movement_1E656B:: @ 81E656B + step_98 + step_end + +SootopolisCity_Movement_1E656D:: @ 81E656D + step_9A + step_end SootopolisCity_Text_1E656F: @ 81E656F .string "SOOTOPOLIS CITY POKéMON GYM\n" @@ -1465,7 +1472,9 @@ SootopolisCity_Text_1E65C8: @ 81E65C8 .string "“The mystical city where history\n" .string "slumbers.”$" - .incbin "baserom.gba", 0x1e6604, 0x14 + +SootopolisCity_Text_1E6604: @ 81E6604 + .string "The door is closed.$" SootopolisCity_Text_1E6618: @ 81E6618 .string "Diving in the sea. Climbing up and\n" diff --git a/data/maps/scripts/SootopolisCity_MysteryEventsHouse_1F.inc b/data/maps/scripts/SootopolisCity_MysteryEventsHouse_1F.inc index 26114cb3b..ccd4558fd 100644 --- a/data/maps/scripts/SootopolisCity_MysteryEventsHouse_1F.inc +++ b/data/maps/scripts/SootopolisCity_MysteryEventsHouse_1F.inc @@ -223,14 +223,16 @@ SootopolisCity_MysteryEventsHouse_1F_Text_227D5B: @ 8227D5B .string "It was a brilliant match in which\n" .string "neither side conceded a step!$" - .incbin "baserom.gba", 0x227db5, 0x3 +SootopolisCity_MysteryEventsHouse_1F_Text_227DB5: @ 8227DB5 + .string "{STR_VAR_1}$" SootopolisCity_MysteryEventsHouse_1F_Text_227DB8: @ 8227DB8 .string "That was superlative!\p" .string "Why, it was like seeing myself in\n" .string "my youth again!$" - .incbin "baserom.gba", 0x227e00, 0x3 +SootopolisCity_MysteryEventsHouse_1F_Text_227E00: @ 8227E00 + .string "{STR_VAR_1}$" SootopolisCity_MysteryEventsHouse_1F_Text_227E03: @ 8227E03 .string "Ah, too bad for you!\p" diff --git a/data/maps/scripts/TrainerHill_Entrance.inc b/data/maps/scripts/TrainerHill_Entrance.inc index 535d564fb..d4cc8a2ba 100644 --- a/data/maps/scripts/TrainerHill_Entrance.inc +++ b/data/maps/scripts/TrainerHill_Entrance.inc @@ -438,7 +438,14 @@ TrainerHill_Roof_Text_268C31: @ 8268C31 .string "a tag team with you!\p" .string "Until we meet again, amigo!$" - .incbin "baserom.gba", 0x268cc6, 0x94 +TrainerHill_Roof_Text_268CC6: @ 8268CC6 + .string "I had the TRAINER HILL built for but\n" + .string "one reason and one only!\p" + .string "To find the most suitable partner\n" + .string "with whom I may form a tag team!$" + +TrainerHill_Entrance_Text_268D47: @ 8268D47 + .string "{STR_VAR_1} min. {STR_VAR_2}.{STR_VAR_3} sec.$" TrainerHill_Entrance_Text_268D5A: @ 8268D5A .string "Who knows what sort of TRAINERS\n" |